From 9e5dbcfde52f7cf32d2757172cf6de23bd3b8156 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 29 Jul 2013 13:52:48 -0400
Subject: [PATCH] STORM-1838 Add display name handling to the initial
notification
---
indra/newview/llavataractions.cpp | 6 +-----
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 45992b8c839..5f1f57f5506 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 3a01084b9a1..5c5d3b342a4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3975,7 +3975,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">
--
GitLab