diff options
author | simon <none@none> | 2014-03-11 10:41:52 -0700 |
---|---|---|
committer | simon <none@none> | 2014-03-11 10:41:52 -0700 |
commit | c7aad1f7e3f643706d714b4426070174abc95145 (patch) | |
tree | aefbe573a6bf0deb3278840b3078ebd3368ef63a /indra/newview/llfloaterimcontainer.cpp | |
parent | 8b28593c107145af24f860b3f8d55568987ac6c0 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Merge downstream code to 3.7.4
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
-rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index d0c32a8c80..bb4b9d2d40 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -87,8 +87,6 @@ LLFloaterIMContainer::LLFloaterIMContainer(const LLSD& seed, const Params& param LLFloaterIMContainer::~LLFloaterIMContainer() { - LL_INFOS("Baker") << "[3555] ~LLFloaterIMContainer() -- " << mGeneralTitle << ":" << (void*) this << " ----------------------" << LL_ENDL; - mConversationsEventStream.stopListening("ConversationsRefresh"); gIdleCallbacks.deleteFunction(idle, this); mNewMessageConnection.disconnect(); @@ -96,7 +94,6 @@ LLFloaterIMContainer::~LLFloaterIMContainer() if (mMicroChangedSignal.connected()) { - LL_INFOS("Baker") << "[3555] ~LLFloaterIMContainer() - Disconnect from microsignal" << LL_ENDL; mMicroChangedSignal.disconnect(); } @@ -106,11 +103,8 @@ LLFloaterIMContainer::~LLFloaterIMContainer() if (!LLSingleton<LLIMMgr>::destroyed()) { - LL_INFOS("Baker") << "[3555] ~LLFloaterIMContainer() - LLIMMgr is not destroyed, so remove the session observer" << LL_ENDL; LLIMMgr::getInstance()->removeSessionObserver(this); } - - LL_INFOS("Baker") << "[3555] Exiting ~LLFloaterIMContainer() " << (void*) this << LL_ENDL; } void LLFloaterIMContainer::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) |