diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
| commit | 36954908632d6f5366f6517023676c1bcd71aa17 (patch) | |
| tree | 3c46d7c43e474ba71596ebec5730cf0f0ed72a1a /indra/llui/llmenubutton.cpp | |
| parent | c6302cfbc750171ef536426d40e966e43e3aedc9 (diff) | |
| parent | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (diff) | |
merge fixes for STORM-432
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
| -rw-r--r-- | indra/llui/llmenubutton.cpp | 7 |
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; |