diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-18 18:42:31 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-18 18:42:31 +0200 |
| commit | 8e134590e6651ba36ba9d38ccf10fae249645299 (patch) | |
| tree | fe7041d4e14deeaa45243c82df6d3fdf2a02e88c /indra | |
| parent | 1933a378ea9082c6603f29964d2a8214e3142638 (diff) | |
Fixed low bug EXT-871 ("Stop Flying" button isn't displayed after standing up)
- moved code to show Stop Flying button in a common place for both cases: click on "Stand" btn & call "Stand Up" menu item
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -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() |