summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-11-30 11:03:39 -0500
committerLoren Shih <seraph@lindenlab.com>2010-11-30 11:03:39 -0500
commitb778ba9b882ecb03e61b3b9bd833618ca096f5da (patch)
treede5aba4a99443999015574f7e2a2a5b7b27a42eb /indra/llui/llmenubutton.cpp
parente67e5cbc404d61efa4d5b3a454f55ecc194af43d (diff)
parentf62a702c2bb912078d2f5481cd7ced819c142f18 (diff)
Automated merge from viewer-development
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;