summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-18 16:37:07 -0500
committerOz Linden <oz@lindenlab.com>2013-01-18 16:37:07 -0500
commit3e3fda589b11d53fceb9bbeed9f0333d88c3816f (patch)
tree43bfd5e88ede272242db36d9000fcdac84541725 /indra/newview/skins/default/xui/en/notifications.xml
parentd16757545c91d4f7dac3c52a311ad0f0239052e1 (diff)
parent70722454f6650438c9b659ff08b4d7bc6dfc2e7e (diff)
merge up to 3.4.4-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml23
1 files changed, 23 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9dae77a304..0628e54902 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6515,6 +6515,29 @@ However, this region contains content accessible to adults only.
Teleport offer sent to [TO_NAME]
</notification>
+ <notification
+ icon="notify.tga"
+ name="TeleportRequest"
+ type="notify">
+[NAME_SLURL] is requesting to be teleported your to your location.
+
+Will you permit this?
+ <tag>confirm</tag>
+ <form name="form">
+ <button
+ index="0"
+ name="Yes"
+ text="Yes"/>
+ <button
+ index="1"
+ name="No"
+ text="No"/>
+ <button
+ index="2"
+ name="IM"
+ text="IM"/>
+ </form>
+ </notification>
<notification
icon="notify.tga"