From 56504054d8e0cba815c25035ed7dd71015cf3222 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk 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/llpanelplacestab.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelplacestab.h') diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h index 458694d766..b4d839452e 100644 --- a/indra/newview/llpanelplacestab.h +++ b/indra/newview/llpanelplacestab.h @@ -34,7 +34,7 @@ #include "llpanel.h" -#include "llpanelplaces.h" +class LLPanelPlaces; class LLPanelPlacesTab : public LLPanel { @@ -55,6 +55,11 @@ public: const std::string& url, const LLUUID& snapshot_id, bool teleport); + +public: + // Search string for filtering landmarks and teleport history locations + static std::string sFilterSubString; + protected: LLButton* mTeleportBtn; LLButton* mShowOnMapBtn; -- cgit v1.2.3 From fe284981abacbd4fa18db7b87fc76289057d3851 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 3 Dec 2009 16:16:21 +0200 Subject: Fixed normal bug EXT-3004 "Created landmark isn't saved in "Favorite" folder and isn't shown in "Fav" bar". - Added enabling "Save" landmark button only after landmark is loaded. Minor cleanup of fix for EXT-2346 "My Landmarks accordion panels shouldn't be displayed if there are no landmarks in respective folders". --HG-- branch : product-engine --- indra/newview/llpanelplacestab.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelplacestab.h') diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h index b4d839452e..ce77a42259 100644 --- a/indra/newview/llpanelplacestab.h +++ b/indra/newview/llpanelplacestab.h @@ -56,13 +56,15 @@ public: const LLUUID& snapshot_id, bool teleport); -public: - // Search string for filtering landmarks and teleport history locations - static std::string sFilterSubString; + const std::string& getFilterSubString() { return sFilterSubString; } + void setFilterSubString(const std::string& string) { sFilterSubString = string; } protected: LLButton* mTeleportBtn; LLButton* mShowOnMapBtn; + + // Search string for filtering landmarks and teleport history locations + static std::string sFilterSubString; }; #endif //LL_LLPANELPLACESTAB_H -- cgit v1.2.3