diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-01-15 04:38:05 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-01-15 04:38:05 +0200 |
commit | f98160ebcd6cf0e996da2dabe25e08bbb6f99c26 (patch) | |
tree | 752a79dc0e0bb9eff2f8972ff9fe1f7cb519536c | |
parent | 1e682ef5cad1663779aa8a6919c1bcafddb1dcc4 (diff) |
MAINT-6050 Link the owner's name in the Open URL dialog to their profile
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 2 | ||||
-rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f3d0369da6..e5abbf7683 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -7442,7 +7442,7 @@ void callback_load_url_name(const LLUUID& id, const std::string& full_name, bool args["URL"] = load_url_info["url"].asString(); args["MESSAGE"] = load_url_info["message"].asString();; args["OBJECTNAME"] = load_url_info["object_name"].asString(); - args["NAME"] = owner_name; + args["NAME_SLURL"] = LLSLURL(is_group ? "group" : "agent", id, "about").getSLURLString(); LLNotificationsUtil::add("LoadWebPage", args, load_url_info); } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7a70fb1a2a..d567897ed8 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7520,8 +7520,8 @@ Load web page [URL] ? [MESSAGE] -From object: <nolink>[OBJECTNAME]</nolink>, owner: [NAME] - <tag>confirm</tag> +From object: <nolink>[OBJECTNAME]</nolink>, owner: [NAME_SLURL] + <tag>confirm</tag> <form name="form"> <button index="0" |