diff options
| author | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
| commit | b215c724c1394e7c27a0309341ffc3b4f2154b25 (patch) | |
| tree | c9a5eba93a0d333285bc2e87e15ed40e546f7d28 /indra/llui/llmenubutton.cpp | |
| parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) | |
| parent | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
| -rw-r--r-- | indra/llui/llmenubutton.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp index eed0085273..50d59f79f4 100644 --- a/indra/llui/llmenubutton.cpp +++ b/indra/llui/llmenubutton.cpp @@ -35,9 +35,16 @@ static LLDefaultChildRegistry::Register<LLMenuButton> r("menu_button"); +void LLMenuButton::MenuPositions::declareValues() +{ + declare("topleft", MP_TOP_LEFT); + declare("topright", MP_TOP_RIGHT); + declare("bottomleft", MP_BOTTOM_LEFT); +} LLMenuButton::Params::Params() -: menu_filename("menu_filename") +: menu_filename("menu_filename"), + position("position", MP_BOTTOM_LEFT) { } @@ -45,7 +52,7 @@ LLMenuButton::Params::Params() LLMenuButton::LLMenuButton(const LLMenuButton::Params& p) : LLButton(p), mIsMenuShown(false), - mMenuPosition(MP_BOTTOM_LEFT) + mMenuPosition(p.position) { std::string menu_filename = p.menu_filename; |