diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-22 16:23:49 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-22 16:23:49 +0200 |
| commit | 1fb9389822405bae537d7203cd56ffee5f717664 (patch) | |
| tree | c13bd6345ae54fc272bdb788609066f6790d4462 /indra/newview/lltransientdockablefloater.cpp | |
| parent | ad501d7fab624c7a85a70fb66e3e24667984f880 (diff) | |
| parent | a63a1afea649433ae5e50b668fcdd6b43df93c40 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltransientdockablefloater.cpp')
| -rw-r--r-- | indra/newview/lltransientdockablefloater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltransientdockablefloater.cpp b/indra/newview/lltransientdockablefloater.cpp index b830498cb0..c9bfe178ce 100644 --- a/indra/newview/lltransientdockablefloater.cpp +++ b/indra/newview/lltransientdockablefloater.cpp @@ -39,9 +39,10 @@ LLTransientDockableFloater::LLTransientDockableFloater(LLDockControl* dockControl, bool uniqueDocking, const LLSD& key, const Params& params) : - LLDockableFloater(dockControl, uniqueDocking, key, params), LLTransientFloater(this) + LLDockableFloater(dockControl, uniqueDocking, key, params) { LLTransientFloaterMgr::getInstance()->registerTransientFloater(this); + LLTransientFloater::init(this); } LLTransientDockableFloater::~LLTransientDockableFloater() |