diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-25 16:43:49 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-25 16:43:49 -0700 |
| commit | b7b9a37bc13d40a3caf7ea77d6857c2bb6036e06 (patch) | |
| tree | 31b49f69a8661b85cc29324e565ddf76c701139b /indra/newview/llchathistory.cpp | |
| parent | fbb280d84e2b960cfb68e39c251878329b4f4fce (diff) | |
| parent | df450ff17b7a6bb27049f6f462e75fe0763644c3 (diff) | |
STORM-1021 : pull into viewer-development
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index d4ec377e03..c0c9ea1451 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -793,21 +793,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL if ( chat.mSourceType == CHAT_SOURCE_OBJECT && chat.mFromID.notNull()) { // for object IMs, create a secondlife:///app/objectim SLapp - std::string url = LLSLURL("objectim", chat.mFromID, "").getSLURLString(); - url += "?name=" + chat.mFromName; - url += "&owner=" + chat.mOwnerID.asString(); - - std::string slurl = args["slurl"].asString(); - if (slurl.empty()) - { - LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosAgent(chat.mPosAgent); - if(region) - { - LLSLURL region_slurl(region->getName(), chat.mPosAgent); - slurl = region_slurl.getLocationString(); - } - } - url += "&slurl=" + LLURI::escape(slurl); + std::string url = LLViewerChat::getSenderSLURL(chat, args); // set the link for the object name to be the objectim SLapp // (don't let object names with hyperlinks override our objectim Url) |