diff --git a/doc/contributions.txt b/doc/contributions.txt index 2d27562e37a5cd6413b75d880fb80e464b004a8b..72253a0d6f24ce1d7bb081bdaf850089a9e9f18b 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -717,6 +717,7 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2085 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f1d34a144971d8076a324acff0382a232c0d3506..83384e0902e36df1bc6629b2c2b3dd997e8bdbfc 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3792,17 +3792,6 @@ 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" @@ -3815,7 +3804,7 @@ You have left the group [group_name]. </notification> <notification - icon="aler.tga" + icon="alert.tga" name="GroupDepartError" type="alert"> Unable to leave group: [reason].