From 942bbf943d74b8804c4d3fee98a14c8618a4e031 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 5 Jan 2017 11:45:17 +0200
Subject: MAINT-7029 Pop-up menu isn't shown in Place profile if all menu items
 are disabled

---
 indra/llui/llmenugl.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llui/llmenugl.h')

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;
-- 
cgit v1.2.3