diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-22 15:03:18 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-22 15:03:18 +0200 |
| commit | 951d6e9d8ce636ae01aab37f7e67c7389ebcea11 (patch) | |
| tree | ba85d3b41cd546b7eaac20b4d4eb26504121fb12 | |
| parent | 1a8325f4dceeb9fa0c92ddbca26fe6a301be4e8d (diff) | |
| parent | fd44fbd4efb73ca4ff4525877619e0951a0deba1 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/lltransientfloatermgr.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltransientfloatermgr.h b/indra/newview/lltransientfloatermgr.h index aecc5a505d..1f99325a7f 100644 --- a/indra/newview/lltransientfloatermgr.h +++ b/indra/newview/lltransientfloatermgr.h @@ -44,13 +44,16 @@ class LLTransientFloater; */ class LLTransientFloaterMgr: public LLSingleton<LLTransientFloaterMgr> { +protected: + LLTransientFloaterMgr(); + friend class LLSingleton<LLTransientFloaterMgr>; + public: enum ETransientGroup { GLOBAL, IM }; - LLTransientFloaterMgr(); void registerTransientFloater(LLTransientFloater* floater); void unregisterTransientFloater(LLTransientFloater* floater); void addControlView(ETransientGroup group, LLView* view); |