Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as
===================================================================
diff -u -r24a9f542d007f70a3497bacf591716d500690206 -r548bcea5178ddd4f3bf42d400a95d1efa7c0c0de
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision 24a9f542d007f70a3497bacf591716d500690206)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision 548bcea5178ddd4f3bf42d400a95d1efa7c0c0de)
@@ -88,21 +88,26 @@
 		setBusy()
 		Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityID + ' status: ' + ca.activityStatus + 'type id: ' + ca.activity.activityTypeID,Debugger.GEN,'activityDoubleClick','LessonController');
 	   
-		if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
+		if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 			
 			if(ca.activityStatus != undefined){
 				var URLToSend:String = 'learning/learner.do?method=getLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_root.userID+'&lessonID='+_root.lessonID;
 				
 				if(ca.activityStatus == 'completed_mc' && ca.activity.activityTypeID != Activity.OPTIONAL_ACTIVITY_TYPE){
 					_lessonModel.getLesson().getActivityURL(URLToSend, true);
+				} else if(ca.activityStatus == 'attempted_mc') {
+					_lessonModel.getLesson().moveToActivity(_lessonModel.progressData.getCurrentActivityId(), ca.activity.activityID);
 				} else {
 					_lessonModel.getLesson().getActivityURL(URLToSend, false);
 				}
 			} else if(_root.mode == 'preview') {
-				_lessonModel.getLesson().moveToActivity(_lessonModel.progressData.getCurrentActivityId(), ca.activity.activityID);
-				
-			}else {
-			
+				/* if child Activity is double-clicked then load the parent Activity */
+				if(ca.activity.parentActivityID != null || ca.activity.parentActivityID != undefined){
+					_lessonModel.getLesson().moveToActivity(_lessonModel.progressData.getCurrentActivityId(), ca.activity.parentActivityID);
+				} else {
+					_lessonModel.getLesson().moveToActivity(_lessonModel.progressData.getCurrentActivityId(), ca.activity.activityID);
+				}
+			} else {
 				var alertMSG:String = Dictionary.getValue('al_doubleclick_todoactivity')
 				getURL("javascript:alert('"+alertMSG+"');");
 				
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r7264d056311dafc7967928d15c508ac26d3b90cb -r548bcea5178ddd4f3bf42d400a95d1efa7c0c0de
Binary files differ