diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/llui/llfloaterreg.h | |
parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) |
merge up from viewer-pre-beta
Diffstat (limited to 'indra/llui/llfloaterreg.h')
-rw-r--r-- | indra/llui/llfloaterreg.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h index a2027a77a0..534cf8b40a 100644 --- a/indra/llui/llfloaterreg.h +++ b/indra/llui/llfloaterreg.h @@ -87,6 +87,7 @@ public: // Helpers static LLFloater* getLastFloaterInGroup(const std::string& name); + static LLFloater* getLastFloaterCascading(); // Find / get (create) / remove / destroy static LLFloater* findInstance(const std::string& name, const LLSD& key = LLSD()); @@ -123,12 +124,7 @@ public: static void registerControlVariables(); // Callback wrappers - static void initUICtrlToFloaterVisibilityControl(LLUICtrl* ctrl, const LLSD& sdname); - static void showFloaterInstance(const LLSD& sdname); - static void hideFloaterInstance(const LLSD& sdname); - static void toggleFloaterInstance(const LLSD& sdname); - static bool floaterInstanceVisible(const LLSD& sdname); - static bool floaterInstanceMinimized(const LLSD& sdname); + static void toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD& key = LLSD()); // Typed find / get / show template <class T> @@ -151,6 +147,7 @@ public: static void blockShowFloaters(bool value) { sBlockShowFloaters = value;} + static U32 getVisibleFloaterInstanceCount(); }; #endif |