diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-24 21:56:50 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-24 21:56:50 +0200 |
| commit | 04cf3fefca230f4f2c351dddebb36e691a9f7bc5 (patch) | |
| tree | 24e793a0d3adaa3597dc8f6280eb3fd23efd1c5d /indra/newview | |
| parent | b619f822e676c803a1b1921a420d284ed08ecdad (diff) | |
| parent | 3d2fbad4cafae520f790f97dad6b4eb6a0363751 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index c066f1f77a..ffa943092f 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -71,6 +71,7 @@ #include "llviewermessage.h" #include "llviewerwindow.h" #include "llnotify.h" +#include "llnearbychat.h" #include "llviewerregion.h" #include "llvoicechannel.h" #include "lltrans.h" @@ -1611,6 +1612,12 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess LLChat chat(message); chat.mSourceType = CHAT_SOURCE_SYSTEM; LLFloaterChat::addChatHistory(chat); + + LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); + if(nearby_chat) + { + nearby_chat->addMessage(chat); + } } else // going to IM session { |