diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-30 17:00:23 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-30 17:00:23 +0200 |
| commit | ff97c319959da28ff9abd59a98a63307d6ed8d34 (patch) | |
| tree | 764c5f09fe2eb5b68271cd654374cc690654f821 /indra/newview/llviewermessage.cpp | |
| parent | 982ed974efe9483d040789845c1059e2a93d073d (diff) | |
fix task EXT-1960 Region messages, should they be displayed in the local chat?
and working on
EXT-239 Save chat window state and position between sessions (not finished)
--HG--
branch : product-engine
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 { |