diff options
| author | Jonathan Yap <none@none> | 2013-07-29 13:53:35 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-07-29 13:53:35 -0400 |
| commit | 8a761f92275a853fce28cf19ea628acdce840779 (patch) | |
| tree | 7d776cad60f7f701b35a63c2531261ed0d06b7ab | |
| parent | f81e2ce680ee2bd7c4704dbbeadee20c8d7eafd5 (diff) | |
| parent | 9e5dbcfde52f7cf32d2757172cf6de23bd3b8156 (diff) | |
STORM-1838 merge
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 45992b8c83..5f1f57f550 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -443,13 +443,9 @@ void LLAvatarActions::teleport_request_callback(const LLSD& notification, const // static void LLAvatarActions::teleportRequest(const LLUUID& id) { - std::string name; - gCacheName->getFullName(id, name); - gCacheName->cleanFullName(name); - LLSD notification; notification["uuid"] = id; - notification["NAME"] = name + "'s"; + notification["NAME_SLURL"] = LLSLURL("agent", id, "about").getSLURLString(); LLSD payload; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0f2ee73950..32635e4540 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4035,7 +4035,7 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportRequestPrompt" type="alertmodal"> -Request a teleport to [NAME] location with the following message +Request a teleport to [NAME_SLURL] with the following message <tag>confirm</tag> <form name="form"> <input name="message" type="text"> |