diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-03 17:32:57 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-03 17:32:57 +0200 |
| commit | 11228d4b7d6be72759625e604fc09bade3cd306e (patch) | |
| tree | 6865dda1aff6668d8c3038415e81210b285c4c59 /indra/newview/llviewermessage.cpp | |
| parent | 11f732bbbe910c2a63efaeb9044d206142d69e2f (diff) | |
| parent | 8cbea388eaad8b40faa604f9d7fa2a64570548e2 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 3bf0fb6f71..e525561b7d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2208,7 +2208,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); } |