diff options
| author | Callum Prentice <callum@gmail.com> | 2017-04-21 14:32:13 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-04-21 14:32:13 -0700 |
| commit | 2a5c47eb083a55cccb60916263b3c2b5d8d9c4fe (patch) | |
| tree | ec40f2091563c690e06fb16d54b84d0e65bef39a /indra/newview/llmoveview.cpp | |
| parent | 8846f9c7c19f85118da7d5601ad1dd14e491b6f5 (diff) | |
| parent | 5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (diff) | |
Automated merge with tip of viewer64 (after it was merged with viewer-release)
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -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 |