diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-12 11:31:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-12 11:31:40 -0400 |
| commit | 84a53eb5477d4ab6782f0f21a9558482f7b66b6b (patch) | |
| tree | 24a82c1a993a1552d7762bcc0c28102dad5e7f62 /indra/newview/skins/default | |
| parent | 1d726db71880579a04b70ca9583f723b552a3347 (diff) | |
| parent | 4e220af01d9b44807abd94f6cfaf3d865b70b893 (diff) | |
merge changes for storm-1297
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 99ab56d10a..f3a8d0a865 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5916,7 +5916,25 @@ An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLU <button index="2" name="Mute" - text="Block"/> + text="Block Owner"/> + </form> + </notification> + + <notification + icon="notify.tga" + name="OwnObjectGiveItem" + type="offer"> +Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you this [OBJECTTYPE]: +<nolink>[ITEM_SLURL]</nolink> + <form name="form"> + <button + index="0" + name="Keep" + text="Keep"/> + <button + index="1" + name="Discard" + text="Discard"/> </form> </notification> |