summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2009-10-29 17:48:12 +0200
committerMike Antipov <mantipov@productengine.com>2009-10-29 17:48:12 +0200
commit8210fba25a3c36abb6627836d5829a5be28534e3 (patch)
tree6e43ec0049a259b99084d86ca7280621cf440c89
parentea0abdac1d67511f9f1ff7b54c84f2e692ce87e0 (diff)
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
-rw-r--r--indra/newview/llmoveview.cpp8
1 files changed, 8 insertions, 0 deletions
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: