diff options
author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
---|---|---|
committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
commit | 82425a230c5ac7c0ca8a9ae55a1addadca9d99e9 (patch) | |
tree | 8705515b0bd2e699980fe832f2fe6739fb5ad895 /indra/newview/llviewermessage.cpp | |
parent | 941497dd30c409a2f352b0bfc1c48bfaca5ea76e (diff) | |
parent | 60e6fa139e8056288514cfa7276eee9133953de9 (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
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"; |