diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
| commit | 9488baada3c0aec7cfa4256708fdda82861cd502 (patch) | |
| tree | 1f71293b54161733269a6f340574ec4960623d0f /indra/newview/llmoveview.cpp | |
| parent | de08d74dc6da594c20aed3673114cbc0ef6d3305 (diff) | |
| parent | 1869a399beb2cb3fa52d21f9c288f4c3b6ab4deb (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index c3d8b91d67..93f7146fc8 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -686,7 +686,7 @@ void LLPanelStandStopFlying::onStopFlyingButtonClick() gAgent.setFlying(FALSE); setFocus(FALSE); // EXT-482 - setVisible(FALSE); + mStopFlyingButton->setVisible(FALSE); } /** @@ -710,7 +710,7 @@ void LLPanelStandStopFlying::updatePosition() left_tb_width = toolbar_left->getRect().getWidth(); } - if(LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("stand_stop_flying_container")) + if(LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("state_management_buttons_container")) { panel_ssf_container->setOrigin(0, y_pos); } |