diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
| commit | cfb666e9d9eb8945a79e2f7999459267caca36ee (patch) | |
| tree | b02e73c02f6f377c99fffc950d72525516647f52 /indra/newview/llimfloatercontainer.cpp | |
| parent | 09c74484ae0df267f01610ab4b594e50a01c05c1 (diff) | |
| parent | b493b8cca491c4b7a76f4c98b34272970d3bb58b (diff) | |
merge
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 33cb3a54a7..c8e48b0d42 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -47,12 +47,13 @@ LLIMFloaterContainer::LLIMFloaterContainer(const LLSD& seed) LLIMFloaterContainer::~LLIMFloaterContainer() { + mNewMessageConnection.disconnect(); LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, this); } BOOL LLIMFloaterContainer::postBuild() { - LLIMModel::instance().mNewMsgSignal.connect(boost::bind(&LLIMFloaterContainer::onNewMessageReceived, this, _1)); + mNewMessageConnection = LLIMModel::instance().mNewMsgSignal.connect(boost::bind(&LLIMFloaterContainer::onNewMessageReceived, this, _1)); // Do not call base postBuild to not connect to mCloseSignal to not close all floaters via Close button // mTabContainer will be initialized in LLMultiFloater::addChild() return TRUE; |