diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-30 14:38:22 +0200 | 
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-30 14:38:22 +0200 | 
| commit | 8f30d5f20413eac9356a84647dfb051cc02e3ba3 (patch) | |
| tree | 88cff5ac5ff3c394df2f25743ef607692b3fae04 | |
| parent | 3e7de89a6d0d58a34d9d75e9b114e9cf298276d6 (diff) | |
EXT-2781. Added reference to issue in comments.
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llagent.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 1 | 
2 files changed, 2 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; diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f9f778449b..ed138f24ca 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3947,6 +3947,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)  			// flying animation from server, the AGENT_CONTROL_FLY flag remains set but the  			// avatar does not play flying animation, so we switch flying mode off.  			// See LLAgent::setFlying(). This may cause "Stop Flying" button to blink. +			// See EXT-2781.  			if (animation_id == ANIM_AGENT_STANDUP && gAgent.getFlying())  			{  				gAgent.setFlying(FALSE);  | 
