MAINT-3075: don't display the target user name as a SLURL in the RequestTeleport dialog

meow-7.2.2
Oz Linden 2013-08-29 16:51:59 -04:00
parent ea305b74d1
commit d43a302eaf
2 changed files with 9 additions and 2 deletions

View File

@ -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;

View File

@ -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">