From dd73ac682eba2f0f33c636d636298a3e6982f16a Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 14 Apr 2010 17:26:26 +0300 Subject: 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 --- indra/newview/llmoveview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llmoveview.cpp') 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) { -- cgit v1.2.3