diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 02:17:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 02:17:01 +0000 |
| commit | ea1bfae838c59e24ec1a962f7d015d609b63d083 (patch) | |
| tree | 4fb1bc94522313df13a6d329cd8fef29d099a46d /indra/newview/llviewermessage.cpp | |
| parent | 8103710c054ec6ea4a46f9732e569e543691184b (diff) | |
Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index aa662b713e..b268413d36 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -95,6 +95,7 @@ #include "llmenugl.h" #include "llmoveview.h" #include "llmutelist.h" +#include "llnearbychat.h" #include "llnotifications.h" #include "llnotify.h" #include "llpanelgrouplandmoney.h" @@ -1986,6 +1987,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // IMs from objcts don't open IM sessions. chat.mSourceType = CHAT_SOURCE_OBJECT; LLFloaterChat::addChat(chat, FALSE, FALSE); + + // archive message in nearby chat + LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); + if(nearby_chat) + nearby_chat->addMessage(chat); + } break; case IM_FROM_TASK_AS_ALERT: |