summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-22 16:19:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-22 16:19:10 -0400
commit0879c48d832a69050e6fc6ac67b0d5f95b52e054 (patch)
treec872ae80e13d12c3a282fd2af2c5005b0edb5e95 /indra/newview/skins/default/xui/en/notifications.xml
parentcbbe82b8dc08260aa4102214a7c99aeab7915371 (diff)
parent2afde26d93cc8773f5e84d187844f909347fc1bf (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml30
1 files changed, 8 insertions, 22 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a9d126e605..5e13259699 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1222,6 +1222,14 @@ You can not wear that item because it has not yet loaded. Please try again in a
<tag>fail</tag>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="MustEnterPasswordToLogIn"
+ type="alertmodal">
+ <tag>fail</tag>
+Please enter your Password to log in.
+ </notification>
+
<notification
icon="alertmodal.tga"
name="MustHaveAccountToLogIn"
@@ -4169,28 +4177,6 @@ You have left the group [group_name].
</notification>
<notification
- icon="aler.tga"
- name="GroupDepartError"
- type="alert">
-Unable to leave group: [reason].
- <tag>reason</tag>
- <usetemplate
- name="okbutton"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alert.tga"
- name="GroupDepart"
- type="alert">
-You have left the group [group_name].
- <tag>group_name</tag>
- <usetemplate
- name="okbutton"
- yestext="OK"/>
- </notification>
-
- <notification
icon="alert.tga"
name="ConfirmKick"
type="alert">