livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1718

master
Oz Linden 2012-02-09 11:51:45 -05:00
parent ab5ec520a3 25610423cf
commit 30fc66adf8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -594,6 +594,7 @@ Jonathan Yap
STORM-1659
STORM-1674
STORM-1685
STORM-1718
STORM-1721
STORM-1727
STORM-1725

8
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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>