diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:57:52 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:57:52 +0000 |
| commit | b5f9e437ea17dd9f1f3e186d6f2bf7108c279ce1 (patch) | |
| tree | f5a73b7cab3cbe4e4dcf112bc34339472a74e83a /indra/newview/llmoveview.cpp | |
| parent | 67af47fd8676718aff3f75d28b1cd9dd77e2ca3e (diff) | |
| parent | 8e134590e6651ba36ba9d38ccf10fae249645299 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 4bf2bac649..97e2b5b86e 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -250,6 +250,12 @@ void LLFloaterMove::setSittingMode(BOOL bSitting) else { LLPanelStandStopFlying::clearStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STAND); + + // show "Stop Flying" button if needed. EXT-871 + if (gAgent.getFlying()) + { + LLPanelStandStopFlying::setStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STOP_FLYING); + } } enableInstance(!bSitting); } @@ -684,10 +690,6 @@ void LLPanelStandStopFlying::onStandButtonClick() gAgent.setControlFlags(AGENT_CONTROL_STAND_UP); setFocus(FALSE); // EXT-482 - - BOOL fly = gAgent.getFlying(); - mStopFlyingButton->setVisible(fly); - setVisible(fly); } void LLPanelStandStopFlying::onStopFlyingButtonClick() |