diff options
author | angela <angela@lindenlab.com> | 2010-03-09 15:59:27 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2010-03-09 15:59:27 +0800 |
commit | 0fe35e068f8148604fe59bff7f80103e75fff07f (patch) | |
tree | 9b09bf8c06ed55a47fdb01192501c9b8a247d167 /indra/llui/llfloaterreg.cpp | |
parent | 7593605ba056a104b245fd20bd65e97fcde9f26c (diff) |
EXT-4684 Beacons are not shown when beacons floater is minimized
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
-rw-r--r-- | indra/llui/llfloaterreg.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 5de3934c8a..7588d8ab7a 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -272,11 +272,11 @@ bool LLFloaterReg::toggleInstance(const std::string& name, const LLSD& key) } //static -// returns true if the instance exists and is visible +// returns true if the instance exists and is visible (doesnt matter minimized or not) bool LLFloaterReg::instanceVisible(const std::string& name, const LLSD& key) { LLFloater* instance = findInstance(name, key); - return LLFloater::isShown(instance); + return LLFloater::isVisible(instance); } //static @@ -463,3 +463,12 @@ bool LLFloaterReg::floaterInstanceVisible(const LLSD& sdname) return instanceVisible(name, key); } +//static +bool LLFloaterReg::floaterInstanceMinimized(const LLSD& sdname) +{ + LLSD key; + std::string name = sdname.asString(); + parse_name_key(name, key); + LLFloater* instance = findInstance(name, key); + return LLFloater::isShown(instance); +} |