diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
| commit | 11c428759e0b99fc34e219181d81d024b0323b4d (patch) | |
| tree | e6ee27fa90d7767ac8f959c97474ee34bab00211 /indra/newview/llfloaterimcontainer.cpp | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
| parent | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index f1a6ef78a6..3d6c5efa05 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -101,7 +101,7 @@ LLFloaterIMContainer::~LLFloaterIMContainer() gSavedPerAccountSettings.setBOOL("ConversationsMessagePaneCollapsed", mMessagesPane->isCollapsed()); gSavedPerAccountSettings.setBOOL("ConversationsParticipantListCollapsed", !isParticipantListExpanded()); - if (!LLSingleton<LLIMMgr>::destroyed()) + if (LLIMMgr::instanceExists()) { LLIMMgr::getInstance()->removeSessionObserver(this); } |