summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2011-01-07 15:22:22 -0800
committerAndrew Meadows <andrew@lindenlab.com>2011-01-07 15:22:22 -0800
commitd23f7df822b6c0557f9426b5e1aa660b77aba01e (patch)
tree2e86e4ec60018beabd35a54cc18fdf322a504269 /indra/llui/llmenubutton.cpp
parentcf64ecb41dbbdcdc3c512510c4a7ebd28c832314 (diff)
parentc132d20a7433e2d09e3521a15497f661fcbd18b8 (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;