EXT-4269 PDD: Add teleport destination to teleport warning dialog

meow-7.2.2
angela 2010-01-19 11:06:17 +08:00
parent 798e33767f
commit 52baeb34b3
3 changed files with 9 additions and 5 deletions

View File

@ -5093,8 +5093,12 @@ void LLLandmarkBridgeAction::doIt()
// Opening (double-clicking) a landmark immediately teleports,
// but warns you the first time.
LLSD payload;
payload["asset_id"] = item->getAssetUUID();
LLNotificationsUtil::add("TeleportFromLandmark", LLSD(), payload);
payload["asset_id"] = item->getAssetUUID();
LLSD args;
args["LOCATION"] = item->getDisplayName();
LLNotificationsUtil::add("TeleportFromLandmark", args, payload);
}
LLInvFVBridgeAction::doIt();

View File

@ -3058,7 +3058,7 @@ Join me in [REGION]
icon="alertmodal.tga"
name="TeleportFromLandmark"
type="alertmodal">
Are you sure you want to teleport?
Are you sure you want to teleport to [LOCATION]?
<usetemplate
ignoretext="Confirm that I want to teleport to a landmark"
name="okcancelignore"

View File

@ -136,8 +136,8 @@
left="0"
name="favorite"
image_drag_indication="Accordion_ArrowOpened_Off"
bottom="55"
width="590">
bottom="55"
width="590">
<chevron_button name=">>"
image_unselected="TabIcon_Close_Off"
image_selected="TabIcon_Close_Off"