summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-29 18:25:03 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-29 18:25:03 -0800
commita7549d6fe5b36b447f7e6f58387711576f9c2f63 (patch)
tree63d81cf896b107cf35b3eecabefc032e021574df /indra/newview/skins/default/xui/en/notifications.xml
parent5bff5d28ee0cd6b2d17bf1676eecb0ae262f1f48 (diff)
parentf0426b924f543c62268ac5098c0c2c6a44e68084 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml15
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6e178ad570..49276172d5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1172,6 +1172,13 @@ Eject [AVATAR_NAME] from your land?
<notification
icon="alertmodal.tga"
+ name="EjectAvatarFromGroup"
+ type="notify">
+You ejected [AVATAR_NAME] from group [GROUP_NAME]
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="AcquireErrorTooManyObjects"
type="alertmodal">
ACQUIRE ERROR: Too many objects selected.
@@ -2375,15 +2382,15 @@ Please choose the male or female avatar. You can change your mind later.
<notification
icon="alertmodal.tga"
name="GrantedModifyRights"
- type="alertmodal">
-[FIRST_NAME] [LAST_NAME] has given you permission to edit their objects.
+ type="notify">
+[NAME] has given you permission to edit their objects.
</notification>
<notification
icon="alertmodal.tga"
name="RevokedModifyRights"
- type="alertmodal">
-Your privilege to modify [FIRST_NAME] [LAST_NAME]&apos;s objects has been revoked
+ type="notify">
+Your privilege to modify [NAME]&apos;s objects has been revoked
</notification>
<notification