summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml64
1 files changed, 53 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b58fdcc99a..bab0c5c72a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -415,6 +415,15 @@ Initialization with the Marketplace failed because of a system or network error.
</notification>
<notification
+ icon="notifytip.tga"
+ name="InvalidKeystroke"
+ type="notifytip">
+There was an invalid keystroke entered.
+[REASON].
+Please input a valid text.
+ </notification>
+
+ <notification
icon="alertmodal.tga"
name="MerchantForceValidateListing"
type="alertmodal">
@@ -4400,14 +4409,28 @@ Are you sure you want to return the selected objects to their owners? Transferab
icon="alert.tga"
name="GroupLeaveConfirmMember"
type="alert">
-You are currently a member of the group &lt;nolink&gt;[GROUP]&lt;/nolink&gt;.
-Leave Group?
+Leave the group &apos;&lt;nolink&gt;[GROUP]&lt;/nolink&gt;&apos;?
+Currently, the fee to join this &quot;group&quot; is L$ [COST].
<tag>group</tag>
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
notext="Cancel"
- yestext="OK"/>
+ yestext="Leave"/>
+ </notification>
+
+ <notification
+ icon="alert.tga"
+ name="GroupLeaveConfirmMemberNoFee"
+ type="alert">
+Leave the group &apos;&lt;nolink&gt;[GROUP]&lt;/nolink&gt;&apos;?
+There is currently no fee to join this group.
+ <tag>group</tag>
+ <tag>confirm</tag>
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="Leave"/>
</notification>
@@ -6173,6 +6196,33 @@ Are you sure you want to delete them?
<notification
icon="alertmodal.tga"
+ name="DeleteWornItems"
+ type="alertmodal">
+ <unique/>
+Some item(s) you wish to delete are being worn on your avatar.
+Remove these items from your avatar?
+ <tag>confirm</tag>
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="Remove item(s) and delete"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDeleteRequiredClothing"
+ type="alertmodal">
+ <unique/>
+Some item(s) you wish to delete are required clothing layers (skin, shape, hair, eyes).
+You must replace those layers before deleting them.
+ <tag>confirm</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="DeleteThumbnail"
type="alertmodal">
<unique/>
@@ -6469,14 +6519,6 @@ Your trash is overflowing. This may cause problems logging in.
</notification>
<notification
- icon="notifytip.tga"
- name="InventoryLimitReachedAIS"
- type="notifytip">
-Your inventory is experiencing issues. Please, contact support.
- <tag>fail</tag>
- </notification>
-
- <notification
icon="alertmodal.tga"
name="InventoryLimitReachedAISAlert"
type="alertmodal">