summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-12-02 21:34:01 -0600
committerDave Parks <davep@lindenlab.com>2010-12-02 21:34:01 -0600
commit98802a1ef99b7e5fb586dc259118fd58dc34631a (patch)
tree51e183db55f7c3dfbc60bcc4ab09e700d8f7f51a /indra/llui/llmenubutton.cpp
parent0be7fcf2a95a6d885bbef583966757d12fc9d18c (diff)
parent680328dd78e1d31a2f8836919a0f6140a76af5f4 (diff)
Merge
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;