diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:23:13 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:23:13 +0100 |
| commit | 9f0f610682e0bcceb88eaddcb7a02acfcf3d05ce (patch) | |
| tree | 2df3177c49f39cc6bf5c72a3877eb13af7d64430 /indra/newview/llmoveview.cpp | |
| parent | 10905a7ed1d650c63f596d0e4511494864b68cd3 (diff) | |
| parent | 6a298ea603258b6f72580379a1b25350c6e8b982 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -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) { |