diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
| commit | 524fbefd2a3b7c6955d5929d7d121ede2386c1df (patch) | |
| tree | 1eccde9b330abd27f81bfaebde29e7fa443f132a /indra/newview/llmoveview.cpp | |
| parent | 0b78b5a2f093ea8df3484e893eda670e4c87cff7 (diff) | |
| parent | 21f19cb6f036787d93b186d6fcfd595ae6f03d87 (diff) | |
Merge
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 c03080beb8..301487b994 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -716,9 +716,9 @@ void LLPanelStandStopFlying::updatePosition() left_tb_width = toolbar_left->getRect().getWidth(); } - if (!mStateManagementButtons.get()) + if (!mStateManagementButtons.get()) // Obsolete?!! { - LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("state_management_buttons_container"); + LLPanel* panel_ssf_container = gToolBarView->getChild<LLPanel>("state_management_buttons_container"); if (panel_ssf_container) { mStateManagementButtons = panel_ssf_container->getHandle(); |