diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-06 16:35:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-06 16:35:02 -0700 |
| commit | 26ae00acf7da222b9478fedcfe5746191116991a (patch) | |
| tree | 0098bae20732b74218ae580273503cbe40c3aa48 /indra/newview/llnotificationhandlerutil.cpp | |
| parent | ee5e689331ff6ba44cebaf9e9fb48f7bc3f590c4 (diff) | |
| parent | 62eb7ec0301c0313cedc2fcb63df8779b22a6d26 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index db8e917435..2484040ac4 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -181,13 +181,14 @@ void LLHandlerUtil::logGroupNoticeToIMGroup( // static void LLHandlerUtil::logToNearbyChat(const LLNotificationPtr& notification, EChatSourceType type) { - if (LLNearbyChat::instanceExists()) + LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"); + if (nearby_chat) { LLChat chat_msg(notification->getMessage()); chat_msg.mSourceType = type; chat_msg.mFromName = SYSTEM_FROM; chat_msg.mFromID = LLUUID::null; - LLNearbyChat::instance().addMessage(chat_msg); + nearby_chat->addMessage(chat_msg); } } |