diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-12-30 21:20:47 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-12-30 21:20:47 -0500 |
| commit | 6f66ec64b9e360a002a6d658327b72aaaab9325a (patch) | |
| tree | 8008a09616c54779ad1524d1306946f4fa6d6115 /indra/newview/llagent.cpp | |
| parent | 99aac097cccb2885b9209a7573226a6048fabd83 (diff) | |
| parent | e9d799801da4c6c9b8ba3facf7e93bbe9906fe18 (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 79b0527a74..d2a56f65dd 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -751,6 +751,7 @@ void LLAgent::setFlying(BOOL fly) // because in this case we won't get a signal to start avatar flying animation and // it will be walking with flying mode "ON" indication. However we allow to switch // the flying mode off if we get ANIM_AGENT_STANDUP signal. See process_avatar_animation(). + // See EXT-2781. if(fly && mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_STANDUP) != mAvatarObject->mSignaledAnimations.end()) { return; |