summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2017-02-27 19:27:18 +0200
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2017-02-27 19:27:18 +0200
commit6c80f7369aaf2cddea55e288b5c402fba54f5d98 (patch)
tree79b098e6e9ce4960537474ba92378cf317d3e476 /indra
parent5bd5a474dd5582047fdbde2f0def0035db8b504a (diff)
MAINT-3235 Stand button not centered when left toolbar is empty
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmoveview.cpp13
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