diff -ur linden.orig/doc/contributions.txt linden/doc/contributions.txt
--- linden.orig/doc/contributions.txt	2007-06-13 13:10:30.000000000 -0400
+++ linden/doc/contributions.txt	2007-06-14 23:18:52.712450742 -0400
@@ -12,7 +12,7 @@
 Dylan Haskell - VWR-72
 Dzonatas Sol - VWR-198, VWR-878
 Eddy Stryker - VWR-15, VWR-23
-Gigs Taggart - VWR-71, VWR-326
+Gigs Taggart - VWR-71, VWR-326, VWR-1203,SVC-318,VWR-1217
 Ginko Bayliss - VWR-4
 Hikkoshi Sakai - VWR-429
 Hiro Sommambulist - VWR-66, VWR-97, VWR-100, VWR-105, VWR-108, VWR-118, VWR-136
diff -ur linden.orig/indra/llcharacter/llmotioncontroller.cpp linden/indra/llcharacter/llmotioncontroller.cpp
--- linden.orig/indra/llcharacter/llmotioncontroller.cpp	2007-06-13 13:10:25.000000000 -0400
+++ linden/indra/llcharacter/llmotioncontroller.cpp	2007-06-16 20:40:56.519744095 -0400
@@ -358,11 +358,7 @@
 	//if the motion is already active, then we're done
 	else if (isMotionActive(motion)) // motion is playing and...
 	{	
-		if (motion->isStopped()) // motion has been stopped
-		{
-			deactivateMotion(motion);
-		}
-		else if (mTime < motion->mSendStopTimestamp)	// motion is still active
+		if (mTime < motion->mSendStopTimestamp)	// motion is still active
 		{
 			return TRUE;
 		}