diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-04-14 17:26:26 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-04-14 17:26:26 +0300 |
| commit | dd73ac682eba2f0f33c636d636298a3e6982f16a (patch) | |
| tree | be84b97c232fefc70208764262ea08082b2f4a75 /indra | |
| parent | 2ddcd1dbd3ba838a9fd50f7db3ccf906ecf61ad8 (diff) | |
Fixed major bug EXT-6786 ('Stand' button is corrupted if movement control floater is opened)
This issue is a regression of EXT-1655: Move Floater is notified about "not flying" after it was notified about "sitting".
Fix: taking into account siting mode while notifying about "flying".
Reviewed by Eugene Mutavchi at https://codereview.productengine.com/secondlife/r/233/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 0f22a50093..4ccf5e1c7b 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -200,7 +200,8 @@ void LLFloaterMove::setFlyingMode(BOOL fly) if (instance) { instance->setFlyingModeImpl(fly); - instance->showModeButtons(!fly); + BOOL is_sitting = isAgentAvatarValid() && gAgentAvatarp->isSitting(); + instance->showModeButtons(!fly && !is_sitting); } if (fly) { |