summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorskolb <none@none>2009-12-11 08:49:37 -0800
committerskolb <none@none>2009-12-11 08:49:37 -0800
commit6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch)
tree7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/newview/llviewermessage.cpp
parent431bfca2ade364dc1165e402537e5e2d3616ebfd (diff)
parenteda8634b17133df5f3104d96ad56d3626a90aad8 (diff)
Merge viewer 2-0 into media
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8c0529e344..31bd264e3a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2096,8 +2096,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLSD payload;
payload["object_id"] = session_id;
payload["owner_id"] = from_id;
+ payload["from_id"] = from_id;
payload["slurl"] = location;
payload["name"] = name;
+ std::string session_name;
+ gCacheName->getFullName(from_id, session_name);
+ payload["SESSION_NAME"] = session_name;
if (from_group)
{
payload["groupowned"] = "true";