From 1da8076a647002216c6001436bb6625285cb1fbd Mon Sep 17 00:00:00 2001
From: Beeks <HgDelirium@gmail.com>
Date: Sun, 12 Sep 2010 20:27:18 -0400
Subject: [PATCH] Actual fix for the AO stop stuff. AO is still not up to par,
 but it's getting there.

Signed-off-by: Beeks <HgDelirium@gmail.com>
---
 indra/newview/llvoavatar.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 2604a191d..4226df540 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5838,15 +5838,14 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
 				stopMotion(LLAO::mOverrides[id], stop_immediate);
 			}*/
 		}
-		/*else if this code ever works without crashing the viewer -HgB
+		else //if this code ever works without crashing the viewer -HgB
 		{
-			if (LLAO::mLastAnimation.notNull())
+			if (LLAO::mLastAnimation != LLUUID::null)
 			{
 				gAgent.sendAnimationRequest(LLAO::mLastAnimation, ANIM_REQUEST_STOP);
-				stopMotion(LLAO::mLastAnimation, true);
-				LLAO::mLastAnimation.setNull();
+				LLAO::mLastAnimation = LLUUID::null;
 			}
-		}*/
+		}
 		// </edit>
 		gAgent.onAnimStop(id);
 	}