diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-21 08:15:28 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-21 08:15:28 -0400 |
commit | f47ceb47bbcfd3466813d1653992e1ea418964b5 (patch) | |
tree | f3b1c26e835c8ddf40587783095a8b8954717d7b /indra/newview/llagent.cpp | |
parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
parent | a46fdc10c76ebbf76b4976f0cbb36b649fe4fdd2 (diff) |
merged jelly-doll viewer-release into bento
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index d933537d2e..b00c960822 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4176,6 +4176,8 @@ void LLAgent::setTeleportState(ETeleportState state) void LLAgent::stopCurrentAnimations() { + LL_DEBUGS("Avatar") << "Stopping current animations" << LL_ENDL; + // This function stops all current overriding animations on this // avatar, propagating this change back to the server. if (isAgentAvatarValid()) @@ -4193,6 +4195,7 @@ void LLAgent::stopCurrentAnimations() // don't cancel a ground-sit anim, as viewers // use this animation's status in // determining whether we're sitting. ick. + LL_DEBUGS("Avatar") << "sit or do-not-disturb animation will not be stopped" << LL_ENDL; } else { @@ -4222,8 +4225,7 @@ void LLAgent::stopCurrentAnimations() // re-assert at least the default standing animation, because // viewers get confused by avs with no associated anims. - sendAnimationRequest(ANIM_AGENT_STAND, - ANIM_REQUEST_START); + sendAnimationRequest(ANIM_AGENT_STAND, ANIM_REQUEST_START); } } |