diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-11 18:24:15 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-11 18:24:15 +0000 |
| commit | 28435a08988022f5dd1d0e931b6ad048b8950e11 (patch) | |
| tree | d83112da5b9a3c0b9bf175e03c11aeda1d461382 /indra/llcharacter/llmotioncontroller.cpp | |
| parent | 309b56280bff46f1696aee73cbd25f2e61232bc7 (diff) | |
NOTE: Partial merges of the maintenance branch up. The bulk of maintenance 62831:63347 is awaiting final QA and merging, post 1.17.0
svn merge -r 63182:63183 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63341:63342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63420:63421 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Rush in the following fixes:
* SL-27250 "Stop All Animations" doesn't work when stuck in a pose after teleporting
* SL-44718 VWR-1040: crash when opening several gestures quickly
* SL-44326 recurring error message in agni nightly #1
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.cpp')
| -rw-r--r-- | indra/llcharacter/llmotioncontroller.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index 71bbdfb932..fad69fc6e9 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -835,6 +835,23 @@ LLMotion *LLMotionController::findMotion(const LLUUID& id) return mAllMotions[id]; } +//----------------------------------------------------------------------------- +// deactivateAllMotions() +//----------------------------------------------------------------------------- +void LLMotionController::deactivateAllMotions() +{ + //They must all die, precious. + for (std::map<LLUUID, LLMotion*>::iterator iter = mAllMotions.begin(); + iter != mAllMotions.end(); iter++) + { + LLMotion* motionp = iter->second; + if (motionp) motionp->deactivate(); + } + + // delete all motion instances + deleteAllMotions(); +} + //----------------------------------------------------------------------------- // flushAllMotions() |