diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-29 11:27:02 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-29 11:27:02 -0800 |
| commit | 826071ef59325a79f1e73fe3c1160910f3fd1dfe (patch) | |
| tree | 08aed4414d747c2f02f02f9bcd6ef607f8165b33 /indra/llui | |
| parent | 2f83766bb71772eda19a4c7c61896c0fd7fae8a4 (diff) | |
| parent | 552ddf4be4a5b906fb65b477cfba68da54bb8ec2 (diff) | |
STORM-666 : pull into viewer-development
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmenubutton.cpp | 7 | ||||
| -rw-r--r-- | indra/llui/llmenubutton.h | 1 |
2 files changed, 8 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; diff --git a/indra/llui/llmenubutton.h b/indra/llui/llmenubutton.h index 9e91b9e99d..7b657595da 100644 --- a/indra/llui/llmenubutton.h +++ b/indra/llui/llmenubutton.h @@ -47,6 +47,7 @@ public: typedef enum e_menu_position { MP_TOP_LEFT, + MP_TOP_RIGHT, MP_BOTTOM_LEFT } EMenuPosition; |