diff options
| author | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
|---|---|---|
| committer | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
| commit | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (patch) | |
| tree | 4c99369867ed9e58b69dfad4ba8ee3a2e9a17b9b /indra/newview/llchiclet.cpp | |
| parent | 5fc9d8bddad16b7d8dc6d481107a8ce690fdf731 (diff) | |
| parent | fee564c26e1018787cf70b95fc677c1da447118c (diff) | |
Pulled from viewer-2-0
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 5497d6121f..f1de4e2982 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -47,6 +47,7 @@ #include "llnotificationsutil.h" #include "lloutputmonitorctrl.h" #include "llscriptfloater.h" +#include "llspeakers.h" #include "lltextbox.h" #include "llvoiceclient.h" #include "llgroupmgr.h" @@ -1271,6 +1272,7 @@ bool LLChicletPanel::addChiclet(LLChiclet* chiclet, S32 index) chiclet->setChicletSizeChangedCallback(boost::bind(&LLChicletPanel::onChicletSizeChanged, this, _1, index)); arrange(); + LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::IM, chiclet); return true; } @@ -1298,6 +1300,7 @@ void LLChicletPanel::removeChiclet(chiclet_list_t::iterator it) mChicletList.erase(it); arrange(); + LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, chiclet); chiclet->die(); } |