Merged lindenlab/viewer-neko into default

meow-7.2.2
Andrey Lihatskiy 2017-03-03 18:59:52 +02:00
commit e08bbd2fa5
1 changed files with 10 additions and 3 deletions

View File

@ -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