diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-30 09:42:04 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-30 09:42:04 -0700 |
| commit | 6324cf82f290e88c3db677e1ced706560d5ca00b (patch) | |
| tree | bb6a8ba8b71a8ee15ab4423b157d18f11ae5b3c5 /indra/newview/llviewermessage.cpp | |
| parent | 478f3d075b778740abe12f92c00ad6527545ee6c (diff) | |
| parent | b2526cde2393ca7d84284b254fb4f37b9e8abb5b (diff) | |
Merge hg.aws.productengine.com/secondlife/viewer-2-0/ revs 3836-3849
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ec6ef92a54..8b7df63884 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1595,8 +1595,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // Claim to be from a local agent so it doesn't go into // console. chat.mText = name + separator_string + message.substr(message_offset); - BOOL local_agent = TRUE; - LLFloaterChat::addChat(chat, FALSE, local_agent); + + LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); + if(nearby_chat) + { + nearby_chat->addMessage(chat); + } } else { |