Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
===================================================================
diff -u -rdfb0215633ab655f7c6782638fe9a089a0b78b71 -rb6a2f8393dea9348fdbaaf943b0589b84df8a393
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	(.../Lesson.as)	(revision dfb0215633ab655f7c6782638fe9a089a0b78b71)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	(.../Lesson.as)	(revision b6a2f8393dea9348fdbaaf943b0589b84df8a393)
@@ -267,28 +267,27 @@
 		}
 	}
 	
+	/** Loads the Activity page in frame or popup-window depending on the status of the Acvtivity. */
 	public function getActivityURL(request:String, popup:Boolean){
 		
-		var callback:Function;
 		if(popup){
-			callback = Proxy.create(this,popupActivity);
+			popupActivity(_root.serverURL + request);
 		} else {
-			callback = Proxy.create(this,loadActivity);
+			loadActivity(_root.serverURL + request);
 		}
 		
-		Application.getInstance().getComms().getRequest(request,callback, false);
 	}
 	
-	private function loadActivity(url:Object){
-		Debugger.log('loading activity : ' + url.activityID + '\npath: ' + url.activityURL,Debugger.CRITICAL,'loadActivity','org.lamsfoundation.lams.Lesson');
+	private function loadActivity(url:String){
+		Debugger.log('loading activity path using forward: ' + url,Debugger.CRITICAL,'loadActivity','org.lamsfoundation.lams.Lesson');
 
-		getURL(url.activityURL,"contentFrame");
+		getURL(url,"contentFrame");
 	}
 	
-	private function popupActivity(url:Object){
-		Debugger.log('loading activity (popup window) : ' + url.activityID + '\npath: ' + url.activityURL,Debugger.CRITICAL,'loadActivity','org.lamsfoundation.lams.Lesson');
+	private function popupActivity(url:String){
+		Debugger.log('loading activity (popup window) path using forward: ' + url,Debugger.CRITICAL,'loadActivity','org.lamsfoundation.lams.Lesson');
 
-		JsPopup.getInstance().launchPopupWindow(url.activityURL, 'LearnerActivity', 600, 800, true, true, true, false, false);
+		JsPopup.getInstance().launchPopupWindow(url, 'LearnerActivity', 600, 800, true, true, true, false, false);
 	
 	}
 	
Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as
===================================================================
diff -u -r5eb2a4ba79c076b4201ea29558639acac6312c7c -rb6a2f8393dea9348fdbaaf943b0589b84df8a393
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision 5eb2a4ba79c076b4201ea29558639acac6312c7c)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision b6a2f8393dea9348fdbaaf943b0589b84df8a393)
@@ -91,7 +91,7 @@
 		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;
+				var URLToSend:String = 'learning/learner.do?method=forwardToLearnerActivityURL&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);
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -rf01bb625c09ce0f7c0a7d1de5766f3d8e026bb94 -rb6a2f8393dea9348fdbaaf943b0589b84df8a393
Binary files differ