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

merge changes for STORM-2085

master
Oz Linden 2015-01-06 11:36:10 -05:00
parent 82a56fb9da 110ad0111a
commit 0d6872e1f5
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -723,6 +723,7 @@ Jonathan Yap
STORM-2034
STORM-2018
STORM-2086
STORM-2085
STORM-2088
STORM-2094
STORM-2099

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

@ -3793,30 +3793,8 @@ Leave Group?
yestext="OK"/>
</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="aler.tga"
name="GroupDepartError"
type="alert">
Unable to leave group: [reason].