diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-02-08 18:11:45 +0200 | 
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-02-08 18:11:45 +0200 | 
| commit | 3e56de13a7ec13cc8331bc21bc63d6fc62f3f4e6 (patch) | |
| tree | 1634c56181d8ae9abcce5c0cbfb92026193d64ba /indra | |
| parent | 0d40ac2ed9ed206d1f20967c09bf88ce0e5702f5 (diff) | |
MAINT-8275 FIXED "Walk/run/fly" toolbar button turns off "fly mode" of avatar when the user log in
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 4999318973..c03080beb8 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -400,12 +400,12 @@ void LLFloaterMove::initMovementMode()  	{  		initMovementMode = MM_FLY;  	} -	setMovementMode(initMovementMode); +	 +	mCurrentMode = initMovementMode; +	bool hide_mode_buttons = (MM_FLY == mCurrentMode) || (isAgentAvatarValid() && gAgentAvatarp->isSitting()); -	if (isAgentAvatarValid()) -	{ -		showModeButtons(!gAgentAvatarp->isSitting()); -	} +	updateButtonsWithMovementMode(mCurrentMode); +	showModeButtons(!hide_mode_buttons);  }  void LLFloaterMove::setModeTooltip(const EMovementMode mode) | 
