summaryrefslogtreecommitdiff
path: root/indra/llui/llfloaterreg.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-28 09:56:21 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-28 09:56:21 +0100
commita7ffd8b7a3d26be6f1841f538631adbb0f3f5604 (patch)
tree8b59519b772b38b01f81689d0e13b3c9cb6d7804 /indra/llui/llfloaterreg.h
parent8ec4f45daa93ca1acc5e45df2def1b84397127e8 (diff)
parenta1b973fc2a5d28e64dcf010e3652beda78745d35 (diff)
merge from PE's viewer-trunk
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