From 8d82b79ab43264af48c9e46873e1ccecba60ceda Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 8 Dec 2010 11:23:24 +0200
Subject: STORM-436 WIP Renamed members for consistency.

---
 indra/newview/llfavoritesbar.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
index 37645523f6..234f0bc7de 100644
--- a/indra/newview/llfavoritesbar.h
+++ b/indra/newview/llfavoritesbar.h
@@ -91,8 +91,8 @@ protected:
 	
 	void showDropDownMenu();
 
-	LLHandle<LLView> mPopupMenuHandle;
-	LLHandle<LLView> mInventoryItemsPopupMenuHandle;
+	LLHandle<LLView> mOverflowMenuHandle;
+	LLHandle<LLView> mContextMenuHandle;
 
 	LLUUID mFavoriteFolderId;
 	const LLFontGL *mFont;
-- 
cgit v1.2.3


From ebdbe36f28c27e14f579722df8ba4e0faebca2ac Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 8 Dec 2010 11:53:13 +0200
Subject: STORM-436 FIXED Favorites overflow list appeared if you clicked a
 favorite landmark context menu item.

---
 indra/newview/llfavoritesbar.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
index 234f0bc7de..1a28731c4f 100644
--- a/indra/newview/llfavoritesbar.h
+++ b/indra/newview/llfavoritesbar.h
@@ -98,6 +98,7 @@ protected:
 	const LLFontGL *mFont;
 	S32 mFirstDropDownItem;
 	bool mUpdateDropDownItems;
+	bool mRestoreOverflowMenu;
 
 	LLUUID mSelectedItemID;
 
-- 
cgit v1.2.3