diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2017-03-03 18:59:52 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2017-03-03 18:59:52 +0200 |
| commit | e08bbd2fa52f76f0254dc9558c4936fb1ca08859 (patch) | |
| tree | 4093a9076f2148c62fbfec428b5f58b40e233f1d | |
| parent | 7040ae108ef60a17ad683cb0e9f81719a0270e51 (diff) | |
| parent | 6c80f7369aaf2cddea55e288b5c402fba54f5d98 (diff) | |
Merged lindenlab/viewer-neko into default
| -rw-r--r-- | indra/newview/llmoveview.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index c3dd08c327..4999318973 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -730,9 +730,16 @@ void LLPanelStandStopFlying::updatePosition() panel_ssf_container->setOrigin(0, y_pos); } - S32 x_pos = bottom_tb_center-getRect().getWidth()/2 - left_tb_width; - - setOrigin( x_pos, 0); + if (gToolBarView != NULL && gToolBarView->getToolbar(LLToolBarEnums::TOOLBAR_LEFT)->hasButtons()) + { + S32 x_pos = bottom_tb_center - getRect().getWidth() / 2 - left_tb_width; + setOrigin( x_pos, 0); + } + else + { + S32 x_pos = bottom_tb_center - getRect().getWidth() / 2; + setOrigin( x_pos, 0); + } } // EOF |