summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplacestab.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-12-03 09:17:51 -0800
committerNat Goodspeed <nat@lindenlab.com>2009-12-03 09:17:51 -0800
commit5fd2938da8d6709a6596833088fd83c60d591507 (patch)
tree9186f79b996eb60a9bb1f5cefada86c0596ac850 /indra/newview/llpanelplacestab.h
parent97f97f286ccca1f736c575f516a61c6a32787807 (diff)
parent57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff)
Merge with recent viewer-2-0
Diffstat (limited to 'indra/newview/llpanelplacestab.h')
-rw-r--r--indra/newview/llpanelplacestab.h7
1 files changed, 6 insertions, 1 deletions
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;