Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.526.2.12 -r1.526.2.13
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v
diff -u -r1.426.2.12 -r1.426.2.13
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as,v
diff -u -r1.62 -r1.62.2.1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	6 Mar 2009 04:38:58 -0000	1.62
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	12 May 2009 03:32:54 -0000	1.62.2.1
@@ -1298,12 +1298,40 @@
 	 * @return  
 	 */
 	private function onGroupingMethodChange(evt:Object){
+		var groupingBy = rndGroup_radio.selection.data;
+		if (groupingBy == "num_learners") { // grouping by changed to "number of learners" check if mappings exist to previously defined groups.
+			var createGroupingUIID:Number = _canvasModel.selectedItem.activity.createGroupingUIID;
+			if (_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(createGroupingUIID)) {
+				LFMessage.showMessageConfirm(Dictionary.getValue('grp_chk_clear_branch_mappings'), Delegate.create(this, clearGroupBasedBranchMappings), Delegate.create(this, reselectGroupingByNumOfGroups));
+			} else {
+				handleGroupingMethodChange();
+			}
+		} else {
+			handleGroupingMethodChange();
+		}
+	}
+	
+	//clear branch mappings for this grouping activity
+	private function clearGroupBasedBranchMappings() {
+		var createGroupingUIID:Number = _canvasModel.selectedItem.activity.createGroupingUIID;
+		if (createGroupingUIID != null) {
+			_canvasModel.getCanvas().ddm.clearBranchMappingsByGroupingUIID(createGroupingUIID);
+		}
+			
+		handleGroupingMethodChange();
+	}
+	
+	private function reselectGroupingByNumOfGroups() {
+		numGroups_rdo.selected = true;
+		handleGroupingMethodChange();
+	}
+	
+	private function handleGroupingMethodChange() {
 		checkEnableGroupsOptions(!_canvasModel.selectedItem.activity.readOnly);
-		updateGroupingMethodData(evt);
+		updateGroupingMethodData({type:'click'});
 		setModified();
 	}
 	
-	
 	private function onScheduleOffsetChange(evt:Object){
 		
 		var startOffsetMins:Number = (days_stp.value * 60 * 24) + (hours_stp.value * 60) + mins_stp.value;