diff options
| author | simon <none@none> | 2014-08-21 09:11:11 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-08-21 09:11:11 -0700 |
| commit | 95a14433b8b6375b8d62970c6df5a08d98764423 (patch) | |
| tree | 8578902253fc5454827e24eedc39717be9d987e2 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | a14ba78dbbfc925c94f1e8ed94b52bc08e626e3d (diff) | |
| parent | 518cc86156c2e10b9e603ac9e661f8c35faf5f70 (diff) | |
Merge downstream code into viewer-lion and become version 3.7.15
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 55e421ebe0..944f600ef7 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -506,7 +506,35 @@ Add this Ability to '[ROLE_NAME]'? notext="No" yestext="Yes"/> </notification> - + + <notification + icon="alertmodal.tga" + name="AssignBanAbilityWarning" + type="alertmodal"> +You are about to add the Ability '[ACTION_NAME]' to the Role '[ROLE_NAME]'. + + *WARNING* +Any Member in a Role with this Ability will also be granted the Abilities '[ACTION_NAME_2]' and '[ACTION_NAME_3]' + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="RemoveBanAbilityWarning" + type="alertmodal"> +You are removing the Ability '[ACTION_NAME]' to the Role '[ROLE_NAME]'. + + *WARNING* +Removing this ability will NOT remove the Abilities '[ACTION_NAME_2]' and '[ACTION_NAME_3]'. + +If you no longer wish to have these abilities granted to this role, disable them immediately! + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + <notification icon="alertmodal.tga" name="EjectGroupMemberWarning" @@ -3777,6 +3805,28 @@ You have left the group [group_name]. </notification> <notification + icon="aler.tga" + name="GroupDepartError" + type="alert"> +Unable to leave group: [reason]. + <tag>reason</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alert.tga" + name="GroupDepart" + type="alert"> +You have left the group [group_name]. + <tag>group_name</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alert.tga" name="ConfirmKick" type="alert"> |