diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
| commit | b6708435214a5af158956b0f6ef6a90bacbcc142 (patch) | |
| tree | 1a0f0612cc87d43e33d466afc7d6928ec7a2e20b /indra/newview/llfloaterimcontainer.cpp | |
| parent | 20d486b52fb8ecefc03eb63a93e4447513d704d2 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index b5aa309066..566f9bc9cc 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -88,12 +88,10 @@ LLFloaterIMContainer::LLFloaterIMContainer(const LLSD& seed, const Params& param LLFloaterIMContainer::~LLFloaterIMContainer() { mConversationsEventStream.stopListening("ConversationsRefresh"); - gIdleCallbacks.deleteFunction(idle, this); - mNewMessageConnection.disconnect(); LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, this); - + if (mMicroChangedSignal.connected()) { mMicroChangedSignal.disconnect(); |