diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:52:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:52:58 -0500 |
| commit | d3cbcc58ef0c8cff0e744b37b83055ec3b48d9e2 (patch) | |
| tree | 0ec6e0965952459f46c42fe1312f7d17f7298383 | |
| parent | df5b1ed85bef99c4a1e9162f413339b2efafe88e (diff) | |
| parent | 25610423cf732aec40c719f7e6c18e4c06968376 (diff) | |
merge changes for storm-1718
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 513f0443f7..49f934b547 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -598,6 +598,7 @@ Jonathan Yap STORM-1674 STORM-1685 STORM-1721 + STORM-1718 STORM-1727 STORM-1725 STORM-1719 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> |