diff options
| author | simon <none@none> | 2014-03-11 11:13:16 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-11 11:13:16 -0700 |
| commit | cf2a180823e4e6daa0649ab54a5f7ed6ba14dbb2 (patch) | |
| tree | 58d360f3ed849ddccae91b139b246318a1648c52 /indra/newview | |
| parent | 2ae011dc5ce8b2112c65757ac85e0567165975cf (diff) | |
| parent | c7aad1f7e3f643706d714b4426070174abc95145 (diff) | |
Merge downstream code with 3.7.3 and new version number
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index c1e43e6d45..0833a98f14 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.7.3 +3.7.4 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) |