diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-22 13:42:52 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-22 13:42:52 +0200 |
| commit | 74429f2ed926362a2ec47d590fc862b55b26f0f8 (patch) | |
| tree | 03b8f0199a32a878974174133d9095d268017fe7 /indra/newview/lltransientdockablefloater.h | |
| parent | 4230c655483b61277bdd4c87e0e2a02a39179c88 (diff) | |
fixed EXT-3670 “Clicking on IM session in IM session well closes IM floater”,
implemented exclude sets for groups of transient floaters, now transient floaters not closes if user click on view from global exclude set or from floater group set;
made IM floater goes foreground if it visible but not focused instead hide floater;
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltransientdockablefloater.h')
| -rw-r--r-- | indra/newview/lltransientdockablefloater.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltransientdockablefloater.h b/indra/newview/lltransientdockablefloater.h index 6e8a3afd22..e0541d6597 100644 --- a/indra/newview/lltransientdockablefloater.h +++ b/indra/newview/lltransientdockablefloater.h @@ -37,12 +37,13 @@ #include "llfloater.h" #include "lldockcontrol.h" #include "lldockablefloater.h" +#include "lltransientfloatermgr.h" /** * Represents floater that can dock and managed by transient floater manager. * Transient floaters should be hidden if user click anywhere except defined view list. */ -class LLTransientDockableFloater : public LLDockableFloater +class LLTransientDockableFloater : public LLDockableFloater, LLTransientFloater { public: LOG_CLASS(LLTransientDockableFloater); @@ -52,6 +53,7 @@ public: /*virtual*/ void setVisible(BOOL visible); /* virtual */void setDocked(bool docked, bool pop_on_undock = true); + virtual LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::GLOBAL; } }; #endif /* LL_TRANSIENTDOCKABLEFLOATER_H */ |