summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-30 20:19:24 -0700
committerRichard Linden <none@none>2010-09-30 20:19:24 -0700
commit93faa08da9d8ebab516191f4b446e86d3c2800a2 (patch)
tree83ae885b76662ec7bf9720c9815f2d7d0c10981d /indra/newview
parent1f7ff277d4e0d050f221e76c143f5101fb02d75f (diff)
EXP-128 FIX Stand button displays partially offscreen
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmoveview.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 35c74d290b..f6b85de4b8 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -740,12 +740,17 @@ void LLPanelStandStopFlying::updatePosition()
LLButton* movement_btn = tray->findChild<LLButton>(BOTTOM_TRAY_BUTTON_NAME);
+ S32 x = 0;
if (movement_btn)
{
// Align centers of the button and the panel.
- S32 x = movement_btn->calcScreenRect().getCenterX() - getRect().getWidth()/2;
- setOrigin(x, 0);
+ x = movement_btn->calcScreenRect().getCenterX() - getRect().getWidth()/2;
+ }
+ else
+ {
+ x = tray->calcScreenRect().getCenterX() - getRect().getWidth()/2;
}
+ setOrigin(x, 0);
}