Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.534 -r1.535
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.434 -r1.435
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as,v
diff -u -r1.89 -r1.90
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	29 Apr 2009 02:58:56 -0000	1.89
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	1 May 2009 05:24:49 -0000	1.90
@@ -278,7 +278,8 @@
 				} // Following is validation for non-tool activities being dropped into the reference activity container which we don't want.
 			} else if (referenceOnCanvas != null && 
 				ca.hitTest(referenceOnCanvas) && 
-				(ca.activity.activityUIID != referenceOnCanvas.activity.activityUIID)) {
+				(ca.activity.activityUIID != referenceOnCanvas.activity.activityUIID) &&
+				 (_canvasModel.activeView instanceof CanvasView)) {
 				
 				if ( !(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE) ) {
 					activitySnapBack(ca);