From 56504054d8e0cba815c25035ed7dd71015cf3222 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Tue, 1 Dec 2009 20:25:01 +0200
Subject: Fixed normal bug EXT-2346 "My Landmarks accordion panels shouldn't be
 displayed if there are no landmarks in respective folders". - Added updating
 accordions contents in idle routine. - Removed inventory observer.

--HG--
branch : product-engine
---
 indra/newview/llpanellandmarks.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index c65abc178b..fa40172ecf 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -46,7 +46,6 @@ class LLAccordionCtrlTab;
 class LLFolderViewItem;
 class LLMenuGL;
 class LLInventoryPanel;
-class LLInventoryObserver;
 class LLInventorySubTreePanel;
 
 class LLLandmarksPanel : public LLPanelPlacesTab, LLRemoteParcelInfoObserver
@@ -64,13 +63,6 @@ public:
 	void onSelectionChange(LLInventorySubTreePanel* inventory_list, const std::deque<LLFolderViewItem*> &items, BOOL user_action);
 	void onSelectorButtonClicked();
 
-	/**
-	 * Updates accordions according to filtered items in lists.
-	 *
-	 * It hides accordion for empty lists
-	 */
-	void updateFilteredAccordions();
-
 protected:
 	/**
 	 * @return true - if current selected panel is not null and selected item is a landmark
@@ -110,6 +102,13 @@ private:
 	bool isActionEnabled(const LLSD& command_name) const;
 	void onCustomAction(const LLSD& command_name);
 
+	/**
+	 * Updates accordions according to filtered items in lists.
+	 *
+	 * It hides accordion for empty lists
+	 */
+	void updateFilteredAccordions();
+
 	/**
 	 * Determines if selected item can be modified via context/gear menu.
 	 *
@@ -148,11 +147,9 @@ private:
 	LLMenuGL*					mGearFolderMenu;
 	LLMenuGL*					mMenuAdd;
 	LLInventorySubTreePanel*	mCurrentSelectedList;
-	LLInventoryObserver*		mInventoryObserver;
 
 	LLPanel*					mListCommands;
 	bool 						mSortByDate;
-	bool						mDirtyFilter;
 	
 	typedef	std::vector<LLAccordionCtrlTab*> accordion_tabs_t;
 	accordion_tabs_t			mAccordionTabs;
-- 
cgit v1.2.3