summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-21 10:31:53 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-21 10:31:53 +0100
commit9eaf8eaf729193542f2b766eba5cbc624806a53f (patch)
treefbe93d19034869ecb517b48f1b59ee71ddadf6be /indra/newview/llchathistory.cpp
parent563c80d2811c0100487f313d96ef6ef0ec15a0d9 (diff)
parent53505bd225608d1f048ca80e0bc475d2c125db3a (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp2
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())