summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-12-10 12:37:02 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-12-10 12:37:02 +0200
commite8a713f820b83d8ca5a395bfcdba3a08e55d5706 (patch)
tree3f5d5e1c297686ba63ed164a9c4d66cd4632cd92 /indra/newview/llviewermessage.cpp
parent02498f1963ca535a318384ce705f7c8e0bd86a23 (diff)
parente9afce6786877778abc24924865b586d5c5f4581 (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
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";