diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
| commit | e0efa1dfa236f8a52a88212298b6e5113ef8f07a (patch) | |
| tree | 9a94d26d308981d2070129147b9ba751118bdd76 /indra/newview/llmoveview.cpp | |
| parent | ef9b7c5b36c7521c4519e682aa312c4c25c31c2f (diff) | |
| parent | 890ec637d41330a2a91d23b09b6aaaf49738d19a (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
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() |