diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-27 09:50:23 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-27 09:50:23 -0700 |
| commit | 99e0c35c40354a3ad4d9e6e0d92a73c15c844441 (patch) | |
| tree | a8f2f50548185f72893256258f1d28dd82bd5efb /indra/newview/llimview.cpp | |
| parent | fd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (diff) | |
| parent | 0804ecb3551514d3321dfd4e3b17c3dab9693444 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index d88a558125..216db15c94 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2486,12 +2486,9 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess LLChat chat(message); chat.mSourceType = CHAT_SOURCE_SYSTEM; - - LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); - - if(nearby_chat) + if (LLNearbyChat::instanceExists()) { - nearby_chat->addMessage(chat); + LLNearbyChat::instance().addMessage(chat); } } else // going to IM session |