MAINT-3075: don't display the target user name as a SLURL in the RequestTeleport dialog
parent
ea305b74d1
commit
d43a302eaf
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
Loading…
Reference in New Issue