diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
| commit | a4d81d0f6995ad52f3c0fc094d93f8652600abbd (patch) | |
| tree | 9fcc82ba3061423c971f56aa70b8447de2677237 /indra/llui/llfloaterreg.cpp | |
| parent | 3fde73508e5b2fb5507b47d1f56d3fb47162b6fc (diff) | |
| parent | b90d1d0b6f60684ba2e97959c6a9d2df0ff8ec79 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index eb67e3a561..5de3934c8a 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -34,6 +34,7 @@ #include "llfloaterreg.h" +//#include "llagent.h" #include "llfloater.h" #include "llmultifloater.h" #include "llfloaterreglistener.h" @@ -45,6 +46,7 @@ LLFloaterReg::instance_list_t LLFloaterReg::sNullInstanceList; LLFloaterReg::instance_map_t LLFloaterReg::sInstanceMap; LLFloaterReg::build_map_t LLFloaterReg::sBuildMap; std::map<std::string,std::string> LLFloaterReg::sGroupMap; +bool LLFloaterReg::sBlockShowFloaters = false; static LLFloaterRegListener sFloaterRegListener; @@ -217,6 +219,8 @@ LLFloaterReg::const_instance_list_t& LLFloaterReg::getFloaterList(const std::str //static LLFloater* LLFloaterReg::showInstance(const std::string& name, const LLSD& key, BOOL focus) { + if( sBlockShowFloaters ) + return 0;// LLFloater* instance = getInstance(name, key); if (instance) { |