summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-03 07:33:24 -0500
committerOz Linden <oz@lindenlab.com>2010-12-03 07:33:24 -0500
commit2491555272283340206f3532b9417ec07df40022 (patch)
tree62cd035d30bbc1689d2bf5fd11261487927b0754 /indra/llui/llmenubutton.cpp
parent039c0466f9759d7b966d8faf60945b3924d017a8 (diff)
parent36954908632d6f5366f6517023676c1bcd71aa17 (diff)
pull latest fixes back from viewer-beta
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
-rw-r--r--indra/llui/llmenubutton.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp
index ac568a83e4..eed0085273 100644
--- a/indra/llui/llmenubutton.cpp
+++ b/indra/llui/llmenubutton.cpp
@@ -175,6 +175,13 @@ void LLMenuButton::updateMenuOrigin()
mY = rect.mTop + mMenuHandle.get()->getRect().getHeight();
break;
}
+ case MP_TOP_RIGHT:
+ {
+ const LLRect& menu_rect = mMenuHandle.get()->getRect();
+ mX = rect.mRight - menu_rect.getWidth();
+ mY = rect.mTop + menu_rect.getHeight();
+ break;
+ }
case MP_BOTTOM_LEFT:
{
mX = rect.mLeft;