From 3c69f34b2fcc7a38dc26d12210e19daed8eb2d3f Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sun, 26 Jul 2015 07:30:27 -0400
Subject: [PATCH] Fix duplicate notification templates

Thanks for pointing this out, MiVo.
---
 .../skins/default/xui/en-us/notifications.xml | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index ff05f179f..ae9ddb64e 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1306,48 +1306,6 @@ Port settings take effect after you restart [APP_NAME].
 Connection to Socks5 proxy [PROXY] was successful.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_NOT_PERMITTED"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the connection, not allowed by rule set
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_CONNECT_ERROR"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the connection, could not open TCP channel
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_NOT_ACCEPTABLE"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the selected authentication system
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_AUTH_FAIL"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" reported your credentials are invalid
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_UDP_FWD_NOT_GRANTED"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the UDP associate request
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_HOST_CONNECT_FAILED"
-   type="alertmodal">
-Could not connect to Socks5 proxy server "[PROXY]"
-  </notification>
-
   <notification
    icon="notify.tga"
    name="ChangeSkin"