From 8210fba25a3c36abb6627836d5829a5be28534e3 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Thu, 29 Oct 2009 17:48:12 +0200 Subject: Fixed Low bug EXT-1079 (Buttons disappear on movement controls if switch movement mode while clashing about land) - added validation if fly mode was exactly set to avatar before processing buttons visibility --HG-- branch : product-engine --- indra/newview/llmoveview.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 2b4e35208a..14da35594f 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -280,6 +280,14 @@ void LLFloaterMove::setMovementMode(const EMovementMode mode) mCurrentMode = mode; gAgent.setFlying(MM_FLY == mode); + // attempts to set avatar flying can not set it real flying in some cases. + // For ex. when avatar fell down & is standing up. + // So, no need to continue processing FLY mode. See EXT-1079 + if (MM_FLY == mode && !gAgent.getFlying()) + { + return; + } + switch (mode) { case MM_RUN: -- cgit v1.2.3