summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-02-06 15:52:58 -0500
committerOz Linden <oz@lindenlab.com>2012-02-06 15:52:58 -0500
commitd3cbcc58ef0c8cff0e744b37b83055ec3b48d9e2 (patch)
tree0ec6e0965952459f46c42fe1312f7d17f7298383 /indra/newview
parentdf5b1ed85bef99c4a1e9162f413339b2efafe88e (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 2b85dc74a1..59dd17ea9d 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>