summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-03-15 12:02:58 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-03-15 12:02:58 -0700
commit3f64343b0b078e481c1c852ccd7201be6826a110 (patch)
tree8e82154ded91c169702e374d2e293712542805fd /indra/newview/skins
parentfa277a3b4a5d5dc5af6eb53ecd005e4789534758 (diff)
parent2c22863888eefbfb0f4245011be989d155583db7 (diff)
Merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/minimal/xui/en/notification_visibility.xml2
-rw-r--r--indra/newview/skins/minimal/xui/en/notifications.xml44
2 files changed, 44 insertions, 2 deletions
diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 9d4836d328..616b544847 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" ?>
<notification_visibility>
- <respond name="UserGiveItem" response="Discard"/>
- <respond name="ObjectGiveItem" response="Discard"/>
<respond name="VoiceInviteP2P" response="Decline"/>
<respond name="VoiceInviteAdHoc" response="Decline"/>
<respond name="VoiceInviteGroup" response="Decline"/>
diff --git a/indra/newview/skins/minimal/xui/en/notifications.xml b/indra/newview/skins/minimal/xui/en/notifications.xml
new file mode 100644
index 0000000000..84da9472cc
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/notifications.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<notifications>
+ <notification
+ icon="notify.tga"
+ name="UserGiveItem"
+ type="offer">
+ [NAME_SLURL] is offering you [ITEM_SLURL]. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
+ <form name="form">
+ <button
+ index="4"
+ name="Show"
+ text="Keep Item"/>
+ <button
+ index="1"
+ name="Discard"
+ text="Reject Item"/>
+ <button
+ index="2"
+ name="Mute"
+ text="Block User"/>
+ </form>
+ </notification>
+ <notification
+ icon="notify.tga"
+ name="ObjectGiveItem"
+ type="offer">
+ An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] is offering you [ITEM_SLURL]. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
+ <form name="form">
+ <button
+ index="0"
+ name="Keep"
+ text="Keep Item"/>
+ <button
+ index="1"
+ name="Discard"
+ text="Reject Item"/>
+ <button
+ index="2"
+ name="Mute"
+ text="Block Object"/>
+ </form>
+ </notification>
+
+</notifications>