diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
| commit | df55db4aa02ef02169d318b1d8b607c2edb3ba5d (patch) | |
| tree | c8d586ca1ab4b54d0b1a65338a79fae59222fc18 /indra/newview/llfloaterimcontainer.cpp | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
| parent | 234ea528505d0363c4c4eb0150e7587e863c8e20 (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 ab57e8c170..cacd66aee9 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); } |