diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-05 11:45:17 +0200 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-05 11:45:17 +0200 |
commit | 942bbf943d74b8804c4d3fee98a14c8618a4e031 (patch) | |
tree | 36e875c34cf18faff336d93b4c5f5e0e2403d54f /indra/llui/llmenugl.h | |
parent | 8ef99c38a5b7d10d3a121f70929d6e26b264dddb (diff) |
MAINT-7029 Pop-up menu isn't shown in Place profile if all menu items are disabled
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r-- | indra/llui/llmenugl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index c7f7f6848c..69f7d21513 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -531,6 +531,9 @@ public: void resetScrollPositionOnShow(bool reset_scroll_pos) { mResetScrollPositionOnShow = reset_scroll_pos; } bool isScrollPositionOnShowReset() { return mResetScrollPositionOnShow; } + void setAlwaysShowMenu(BOOL show) { mAlwaysShowMenu = show; } + BOOL getAlwaysShowMenu() { return mAlwaysShowMenu; } + // add a context menu branch BOOL appendContextSubMenu(LLMenuGL *menu); @@ -572,6 +575,8 @@ private: static LLColor4 sDefaultBackgroundColor; static BOOL sKeyboardMode; + BOOL mAlwaysShowMenu; + LLUIColor mBackgroundColor; BOOL mBgVisible; LLHandle<LLView> mParentMenuItem; |