diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-04-18 19:26:37 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-04-18 19:26:37 +0300 |
| commit | 8a3fce881fbf971046be50d9d7198e58772e3164 (patch) | |
| tree | 7dd98d630eb24559a36190dbb36c6eba4266c104 /indra/llui | |
| parent | b5f842183958f5de8a09156510ede53ac34a5310 (diff) | |
SL-10791 [Legacy Profiles] Functionality to copy agent id and name from profile
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmenubutton.cpp | 8 | ||||
| -rw-r--r-- | indra/llui/llmenubutton.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp index 303afcda15..583704418b 100644 --- a/indra/llui/llmenubutton.cpp +++ b/indra/llui/llmenubutton.cpp @@ -40,6 +40,7 @@ void LLMenuButton::MenuPositions::declareValues() declare("topleft", MP_TOP_LEFT); declare("topright", MP_TOP_RIGHT); declare("bottomleft", MP_BOTTOM_LEFT); + declare("bottomright", MP_BOTTOM_RIGHT); } LLMenuButton::Params::Params() @@ -212,6 +213,13 @@ void LLMenuButton::updateMenuOrigin() mY = rect.mBottom; break; } + case MP_BOTTOM_RIGHT: + { + const LLRect& menu_rect = menu->getRect(); + mX = rect.mRight - menu_rect.getWidth(); + mY = rect.mBottom; + break; + } } } diff --git a/indra/llui/llmenubutton.h b/indra/llui/llmenubutton.h index 67ec1983b3..e42f8f53bd 100644 --- a/indra/llui/llmenubutton.h +++ b/indra/llui/llmenubutton.h @@ -41,7 +41,8 @@ public: { MP_TOP_LEFT, MP_TOP_RIGHT, - MP_BOTTOM_LEFT + MP_BOTTOM_LEFT, + MP_BOTTOM_RIGHT } EMenuPosition; struct MenuPositions |