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/llnearbychathandler.cpp | |
| parent | ee5e689331ff6ba44cebaf9e9fb48f7bc3f590c4 (diff) | |
| parent | 62eb7ec0301c0313cedc2fcb63df8779b22a6d26 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 37f4cc4c19..ca3fffeffd 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -537,7 +537,8 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, } } - LLNearbyChat::instance().addMessage(chat_msg, true, args); + LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"); + nearby_chat->addMessage(chat_msg, true, args); if(chat_msg.mSourceType == CHAT_SOURCE_AGENT && chat_msg.mFromID.notNull() @@ -553,7 +554,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, // Send event on to LLEventStream sChatWatcher->post(chat); - if( LLNearbyChat::instance().isInVisibleChain() + if( nearby_chat->isInVisibleChain() || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT && gSavedSettings.getBOOL("UseChatBubbles") ) || mChannel.isDead() |