diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 12:42:14 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 12:42:14 -0800 |
| commit | 9e2d78aca1fa96e96b4b324cabfb0efeb26f7397 (patch) | |
| tree | 042a161e9bc2608d0098b2ea745178384f466362 /indra/newview/llimview.cpp | |
| parent | f9081220accfe5c197f1c567af8806bde236f946 (diff) | |
| parent | 04cf3fefca230f4f2c351dddebb36e691a9f7bc5 (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -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 { |