summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-12-10 13:15:56 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2010-12-10 13:15:56 -0800
commit10a28e64edb8b1dcd7aca31ec6deef44132fd672 (patch)
tree88051a297901297d5844fa93fc41782742360ae5 /indra/llui/llmenubutton.cpp
parent90da762f97a30c16e23184352f4d413c34279ba4 (diff)
parent426744df2c9a6c04bab594fefbd8b35970d0948d (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;