diff options
| author | McCabe Maxsted | 2009-04-26 19:57:52 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-04-26 20:42:31 -0700 |
| commit | 972749c04c98685ee9645afb294a478db0858998 (patch) | |
| tree | d049cc38ba37a8a80bc48a1f1f93946d612a67ef /linden/indra/newview/llviewermenu.cpp | |
| parent | Fixed space in changelog (diff) | |
| download | meta-impy-972749c04c98685ee9645afb294a478db0858998.zip meta-impy-972749c04c98685ee9645afb294a478db0858998.tar.gz meta-impy-972749c04c98685ee9645afb294a478db0858998.tar.bz2 meta-impy-972749c04c98685ee9645afb294a478db0858998.tar.xz | |
Backported fix from 1.23 for stop animations only being local (VWR-2850)
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 486e4f1..9e0b6a0 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
| @@ -4227,12 +4227,7 @@ class LLToolsStopAllAnimations : public view_listener_t | |||
| 4227 | { | 4227 | { |
| 4228 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 4228 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
| 4229 | { | 4229 | { |
| 4230 | LLVOAvatar* avatarp = gAgent.getAvatarObject(); | 4230 | gAgent.stopCurrentAnimations(); |
| 4231 | if (avatarp) | ||
| 4232 | { | ||
| 4233 | avatarp->deactivateAllMotions(); | ||
| 4234 | avatarp->startDefaultMotions(); | ||
| 4235 | } | ||
| 4236 | return true; | 4231 | return true; |
| 4237 | } | 4232 | } |
| 4238 | }; | 4233 | }; |