diff options
author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
---|---|---|
committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/skins/default/xui/en/notifications.xml | |
parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
viewer-release merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1f1dd4b522..ff042e55ce 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4187,6 +4187,19 @@ Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? notext="Cancel" yestext="Teleport"/> </notification> + + <notification + icon="alertmodal.tga" + name="TeleportViaSLAPP" + type="alertmodal"> +Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm that I want to teleport via SLAPP" + name="okcancelignore" + notext="Cancel" + yestext="Teleport"/> + </notification> <notification icon="alertmodal.tga" @@ -7684,7 +7697,7 @@ Are you sure you want to share the following items: With the following Residents: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -7704,7 +7717,7 @@ Are you sure you want to share the following items: With the following Residents: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -10274,4 +10287,14 @@ Cannot create large prims that intersect other players. Please re-try when othe yestext="OK"/> </notification> + <notification + icon="alert.tga" + name="ChatHistoryIsBusyAlert" + type="alertmodal"> + Chat history file is busy with previous operation. Please try again in a few minutes or choose chat with another person. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + </notifications> |