summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplacestab.cpp
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.cpp
parent97f97f286ccca1f736c575f516a61c6a32787807 (diff)
parent57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff)
Merge with recent viewer-2-0
Diffstat (limited to 'indra/newview/llpanelplacestab.cpp')
-rw-r--r--indra/newview/llpanelplacestab.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp
index b7669fd63d..9806b8c64d 100644
--- a/indra/newview/llpanelplacestab.cpp
+++ b/indra/newview/llpanelplacestab.cpp
@@ -33,14 +33,17 @@
#include "llpanelplacestab.h"
-#include "llwindow.h"
-
+#include "llbutton.h"
#include "llnotificationsutil.h"
-#include "llbutton.h"
+#include "llwindow.h"
+
+#include "llpanelplaces.h"
#include "llslurl.h"
#include "llworldmap.h"
+std::string LLPanelPlacesTab::sFilterSubString = LLStringUtil::null;
+
bool LLPanelPlacesTab::isTabVisible()
{
LLUICtrl* parent = getParentUICtrl();