diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:08:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:08:23 -0500 |
| commit | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (patch) | |
| tree | c4bbed389b33de9dc8fbc746bccccb6545307ad6 /indra/llui/llmenubutton.cpp | |
| parent | 732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 (diff) | |
| parent | 20e192029ceaf7e9b6d097d6e65089d9011a4c0b (diff) | |
merge fix for STORM-679
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; |