diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-24 12:55:22 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-24 12:55:22 -0400 |
| commit | 583060bc631641d24b607289a77b458078b3e4a8 (patch) | |
| tree | afb816976227266bc404c780bcbc5a2c218085cb /indra/newview/llchathistory.cpp | |
| parent | b92c1b6d74818dacbaeaa2c7c3965dd431463b50 (diff) | |
| parent | bd53640901e93346fdc5d3dde534b6be294078a0 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 31feabe722..bd14732b4a 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -649,7 +649,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL // for object IMs, create a secondlife:///app/objectim SLapp std::string url = LLSLURL("objectim", chat.mFromID, "").getSLURLString(); url += "?name=" + chat.mFromName; - url += "&owner=" + args["owner_id"].asString(); + url += "&owner=" + chat.mOwnerID.asString(); std::string slurl = args["slurl"].asString(); if (slurl.empty()) |