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/llnearbychathandler.cpp | |
| parent | fd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (diff) | |
| parent | 0804ecb3551514d3321dfd4e3b17c3dab9693444 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index c97e3585e1..37f4cc4c19 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -487,8 +487,6 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, if(chat_msg.mText.empty()) return;//don't process empty messages - LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); - // Build notification data LLSD chat; chat["message"] = chat_msg.mText; @@ -539,7 +537,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, } } - nearby_chat->addMessage(chat_msg, true, args); + LLNearbyChat::instance().addMessage(chat_msg, true, args); if(chat_msg.mSourceType == CHAT_SOURCE_AGENT && chat_msg.mFromID.notNull() @@ -555,7 +553,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, // Send event on to LLEventStream sChatWatcher->post(chat); - if( nearby_chat->isInVisibleChain() + if( LLNearbyChat::instance().isInVisibleChain() || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT && gSavedSettings.getBOOL("UseChatBubbles") ) || mChannel.isDead() |