summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-02 17:28:55 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-02 17:28:55 +0000
commitcb57f65f689fe98e0f7b2d9fdb4cd753c927a44c (patch)
treec6eeb5af8bebe762a33751903ce96b99d84e4fd2 /indra/newview/llviewermessage.cpp
parentb6bc7d94f244597f3109f2332aa395f8b3623048 (diff)
parentf937153a01f1586e5345d8d08c5cba6cf806cde4 (diff)
merge.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp5
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);
}