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/llnotificationhandlerutil.cpp | |
| parent | fd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (diff) | |
| parent | 0804ecb3551514d3321dfd4e3b17c3dab9693444 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index cba22b233b..db8e917435 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -181,14 +181,13 @@ void LLHandlerUtil::logGroupNoticeToIMGroup( // static void LLHandlerUtil::logToNearbyChat(const LLNotificationPtr& notification, EChatSourceType type) { - LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); - if(nearby_chat) + if (LLNearbyChat::instanceExists()) { LLChat chat_msg(notification->getMessage()); chat_msg.mSourceType = type; chat_msg.mFromName = SYSTEM_FROM; chat_msg.mFromID = LLUUID::null; - nearby_chat->addMessage(chat_msg); + LLNearbyChat::instance().addMessage(chat_msg); } } |