From afe61eb994377e25d60d0a0893510a693149c6be Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 23 Sep 2008 01:53:11 +0000
Subject: QAR-849 merge maint-viewer-10-merge 96838-97237 -> release

---
 indra/llcharacter/llmotioncontroller.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llcharacter/llmotioncontroller.cpp')

diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 3cb4da4e3a..051f2d625c 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -783,6 +783,11 @@ void LLMotionController::updateLoadingMotions()
 			llinfos << "Motion " << motionp->getID() << " init failed." << llendl;
 			sRegistry.markBad(motionp->getID());
 			mLoadingMotions.erase(curiter);
+			motion_set_t::iterator found_it = mDeprecatedMotions.find(motionp);
+			if (found_it != mDeprecatedMotions.end())
+			{
+				mDeprecatedMotions.erase(found_it);
+			}
 			mAllMotions.erase(motionp->getID());
 			delete motionp;
 		}
-- 
cgit v1.3