diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-02-02 17:20:01 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-02-02 17:20:01 +0000 |
| commit | f937153a01f1586e5345d8d08c5cba6cf806cde4 (patch) | |
| tree | 9ec65cb5ef2a5b4ca89a773bfb8a2371638c91c1 /indra/newview/llviewermessage.cpp | |
| parent | d51b7c4b346361e4a3d8ed90440f8cd1b247771e (diff) | |
| parent | e563a07659b74b2dca850834a44c3b92ff993b44 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 26c9a1dd79..adbe28e9a7 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2202,7 +2202,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); if(nearby_chat) { - nearby_chat->addMessage(chat); + LLSD args; + args["owner_id"] = from_id; + args["slurl"] = location; + nearby_chat->addMessage(chat, true, args); } |