summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-02-09 11:51:45 -0500
committerOz Linden <oz@lindenlab.com>2012-02-09 11:51:45 -0500
commit30fc66adf8dd09f71a8e8a291043833ec0065dd0 (patch)
treea5d0a13d1dec4333ebd184c5e8a6d1c79155b17f /indra/newview
parentab5ec520a3a185f911109cd684c3a88ad8a5f35c (diff)
parent25610423cf732aec40c719f7e6c18e4c06968376 (diff)
merge changes for storm-1718
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af75d49353..3972d99d32 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6409,11 +6409,11 @@ Grant this request?
<form name="form">
<button
index="-2"
- name="Mute"
+ name="Client_Side_Mute"
text="Block"/>
<button
index="-1"
- name="Ignore"
+ name="Client_Side_Ignore"
text="Ignore"/>
</form>
</notification>
@@ -6428,11 +6428,11 @@ Grant this request?
<form name="form">
<button
index="-2"
- name="Mute"
+ name="Client_Side_Mute"
text="Block"/>
<button
index="-1"
- name="Ignore"
+ name="Client_Side_Ignore"
text="Ignore"/>
</form>
</notification>