From d43a302eaf1b0ca521d4b865e39a8d849da5d5b8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 29 Aug 2013 16:51:59 -0400
Subject: [PATCH] MAINT-3075: don't display the target user name as a SLURL in
the RequestTeleport dialog
---
indra/newview/llavataractions.cpp | 9 ++++++++-
indra/newview/skins/default/xui/en/notifications.xml | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 5f1f57f5506..70cc48f12b8 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -445,7 +445,14 @@ void LLAvatarActions::teleportRequest(const LLUUID& id)
{
LLSD notification;
notification["uuid"] = id;
- notification["NAME_SLURL"] = LLSLURL("agent", id, "about").getSLURLString();
+ LLAvatarName av_name;
+ if (!LLAvatarNameCache::get(id, &av_name))
+ {
+ // unlikely ... they just picked this name from somewhere...
+ LLAvatarNameCache::get(id, boost::bind(&LLAvatarActions::teleportRequest, id));
+ return; // reinvoke this when the name resolves
+ }
+ notification["NAME"] = av_name.getCompleteName();
LLSD payload;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9ed9a6f409f..fce21b403bc 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4073,7 +4073,7 @@ Join me in [REGION]
icon="alertmodal.tga"
name="TeleportRequestPrompt"
type="alertmodal">
-Request a teleport to [NAME_SLURL] with the following message
+Request a teleport to [NAME] with the following message
<tag>confirm</tag>
<form name="form">
<input name="message" type="text">
--
GitLab