summaryrefslogtreecommitdiff
path: root/indra/llui/llfloaterreg.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-02 11:09:17 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-02 11:09:17 -0700
commit28d23e8c85ba6073cffbd3597342c43f4f9c7971 (patch)
tree8e817fa78c67ffe686d57f4889016623dfeffab2 /indra/llui/llfloaterreg.h
parentb742f0c2a4cf1355044fbcebdad4346a4871a89b (diff)
parent4835c615d5a00f146bcd5c7a50153418ce2a3613 (diff)
Merge
Diffstat (limited to 'indra/llui/llfloaterreg.h')
-rw-r--r--indra/llui/llfloaterreg.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
index 5cacf76771..f1ba41f638 100644
--- a/indra/llui/llfloaterreg.h
+++ b/indra/llui/llfloaterreg.h
@@ -76,6 +76,10 @@ private:
static build_map_t sBuildMap;
static std::map<std::string,std::string> sGroupMap;
static bool sBlockShowFloaters;
+ /**
+ * Defines list of floater names that can be shown despite state of sBlockShowFloaters.
+ */
+ static std::set<std::string> sAlwaysShowableList;
public:
// Registration