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.xml19
1 files changed, 13 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f48cc6d4bf..a07b23d0c3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1688,7 +1688,7 @@ This location can play streaming media.
Streaming media requires a fast Internet connection.
Play streaming media when available?
-(You can change this option later under Preferences > Audio & Video.)
+(You can change this option later under Preferences > Privacy.)
<usetemplate
name="okcancelbuttons"
notext="Disable"
@@ -3480,7 +3480,7 @@ Publish this classified now for L$[AMOUNT]?
icon="alertmodal.tga"
name="SetClassifiedMature"
type="alertmodal">
-Does this classified contain Mature content?
+Does this classified contain Moderate content?
<usetemplate
canceltext="Cancel"
name="yesnocancelbuttons"
@@ -3492,7 +3492,7 @@ Does this classified contain Mature content?
icon="alertmodal.tga"
name="SetGroupMature"
type="alertmodal">
-Does this group contain Mature content?
+Does this group contain Moderate content?
<usetemplate
canceltext="Cancel"
name="yesnocancelbuttons"
@@ -4499,14 +4499,14 @@ You don&apos;t have permission to copy this.
<notification
icon="notifytip.tga"
name="InventoryAccepted"
- type="notifytip">
+ type="offer">
[NAME] received your inventory offer.
</notification>
<notification
icon="notifytip.tga"
name="InventoryDeclined"
- type="notifytip">
+ type="offer">
[NAME] declined your inventory offer.
</notification>
@@ -4568,7 +4568,7 @@ Some terms in your search query were excluded due to content restrictions as cla
icon="notifytip.tga"
name="NoContentToSearch"
type="notifytip">
-Please select at least one type of content to search (PG, Mature, or Adult).
+Please select at least one type of content to search (General, Moderate, or Adult).
</notification>
<notification
@@ -5128,6 +5128,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
text="Decline"/>
</form>
</notification>
+
+ <notification
+ icon="notify.tga"
+ name="FriendshipOffered"
+ type="offer">
+ You have offered friendship to [TO_NAME]
+ </notification>
<notification
icon="notify.tga"