From c12c60df4a28b3cb91870ae0666eb6b3422ff96b Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Fri, 15 Oct 2010 00:10:55 +0300
Subject: STORM-263 FIXED popup menu of Cog button in lower-left of sidebar
 panel closing on second click

- Changed type of gear menu buttons from LLButton to LLMenuButton in all sidebar panels where gear menu button is used.

- Added setMenuPosition(), setMenu() and updateMenuOrigin() to the LLMenuButton.

- Moved actions common for displaying a context menu to LLMenuButton::toggleMenu().

- In all sidebar panels where LLButton was replaced with LLMenuButton the following steps were taken:
    1. setting gearMenu and its position relative to the menuButton with LLMenuButton::setMenu()
    2. setting mouse down callback for the menuButton if needed.
    3. calculating the menu origin point with LLMenuButton::updateMenuOrigin() in mouse down callback
---
 indra/newview/llpanellandmarks.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llpanellandmarks.h')

diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 0d4402d8cb..28c19d3e5f 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -39,6 +39,7 @@
 
 class LLAccordionCtrlTab;
 class LLFolderViewItem;
+class LLMenuButton;
 class LLMenuGL;
 class LLInventoryPanel;
 class LLPlacesInventoryPanel;
@@ -155,6 +156,7 @@ private:
 	LLPlacesInventoryPanel*		mLandmarksInventoryPanel;
 	LLPlacesInventoryPanel*		mMyInventoryPanel;
 	LLPlacesInventoryPanel*		mLibraryInventoryPanel;
+	LLMenuButton*				mGearButton;
 	LLMenuGL*					mGearLandmarkMenu;
 	LLMenuGL*					mGearFolderMenu;
 	LLMenuGL*					mMenuAdd;
-- 
cgit v1.2.3