diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-03 13:35:44 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-03 13:35:44 -0500 |
commit | a9609ae1557a70e095088e0a9b6ef5564dfdb388 (patch) | |
tree | f0fd474461afe3857bf6472f0ae896a276af21cb /indra/newview/llpanelplacestab.cpp | |
parent | 4fb7fd9fffde08ffad4b2fe8f5ead5e500d76419 (diff) | |
parent | b05ebd89775792762063d3af08f0fe9ae785454a (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelplacestab.cpp')
-rw-r--r-- | indra/newview/llpanelplacestab.cpp | 9 |
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(); |