diff options
| author | Richard Linden <none@none> | 2011-03-14 17:53:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-14 17:53:59 -0700 |
| commit | b75060e29095df4200320305fa8a907820a93412 (patch) | |
| tree | a93821b7bf86ccf2637a76205ce0b6e1b5d83950 /indra/newview/skins | |
| parent | abc8beaeaa3613843b53433c7c06456d3614b45e (diff) | |
| parent | 9b9d11583035bb2a5bbb213d9d96eaa563552637 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/notifications.xml | 44 |
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 <nolink>[OBJECTFROMNAME]</nolink> 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> |