From 74d9bf0d5525426feae4ea21e2a81034ddcf4d7f Mon Sep 17 00:00:00 2001 From: Robin Cornelius Date: Mon, 28 Mar 2011 11:20:06 +0100 Subject: VWR-20801 Implement SOCKS 5 Proxy for the viewer --- .../newview/skins/default/xui/en/notifications.xml | 70 ++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ba13479860..751b038252 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7069,6 +7069,76 @@ Mute everyone? + + The Socks5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set + + + + + The Socks5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel + + + + + The Socks5 proxy "[HOST]:[PORT]" refused the selected authentication system + + + + + The Socks5 proxy "[HOST]:[PORT]" reported your credentials are invalid + + + + + The Socks5 proxy "[HOST]:[PORT]" refused the UDP associate request + + + + + Could not connect to Socks5 proxy server "[HOST]:[PORT]" + + + + + Socks 5 proxy settings take effect after you restart [APP_NAME]. + + + -- cgit v1.2.3 From 7717b6f647feb250c0b94d038f72a640a7888915 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Tue, 28 Jun 2011 19:54:53 -0400 Subject: STORM-1112 More cleanup of SOCKS 5 proxy code. Renamed llsocks5.cpp to llproxy.cpp. --- .../newview/skins/default/xui/en/notifications.xml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 06a9baf8c8..7bf742d949 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7164,7 +7164,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_NOT_PERMITTED" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set + The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set + fail @@ -7174,7 +7175,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_CONNECT_ERROR" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel + The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel + fail @@ -7184,7 +7186,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_NOT_ACCEPTABLE" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the selected authentication system + The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system + fail @@ -7194,7 +7197,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_AUTH_FAIL" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" reported your credentials are invalid + The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid + fail @@ -7204,7 +7208,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_UDP_FWD_NOT_GRANTED" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the UDP associate request + The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request + fail @@ -7214,7 +7219,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_HOST_CONNECT_FAILED" type="alertmodal"> - Could not connect to Socks5 proxy server "[HOST]:[PORT]" + Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]" + fail @@ -7224,7 +7230,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="ChangeSocks5Settings" type="alert"> - Socks 5 proxy settings take effect after you restart [APP_NAME]. + SOCKS 5 proxy settings take effect after you restart [APP_NAME]. + fail -- cgit v1.2.3 From f15d28a636da7b6d2784d9301e7a030b5bd38a8c Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Thu, 28 Jul 2011 13:47:20 -0400 Subject: Proxy cleanup in llstartup.cpp and llproxy.cpp. --- indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 78685dbd79..8b7e6d8c4e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7207,6 +7207,17 @@ Click and drag anywhere on the world to rotate your view name="okbutton" yestext="OK"/> + + + Unknown SOCKS error with server "[HOST]:[PORT]" + fail + + Date: Fri, 29 Jul 2011 15:38:20 -0400 Subject: STORM-1112 Input sanitization of proxy options. --- .../newview/skins/default/xui/en/notifications.xml | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8b7e6d8c4e..ccc678d942 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7218,6 +7218,50 @@ Click and drag anywhere on the world to rotate your view name="okbutton" yestext="OK"/> + + + Invalid SOCKS proxy address or port "[HOST]:[PORT]". + fail + + + + + Invalid SOCKS 5 username or password. + fail + + + + + Invalid HTTP proxy address or port "[HOST]:[PORT]". + fail + + + + + Invalid SOCKS proxy address or port "[HOST]:[PORT]". + fail + + Date: Fri, 12 Aug 2011 14:23:43 -0400 Subject: LLProxy: xui string cleanup. --- indra/newview/skins/default/xui/en/notifications.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6867305b70..5aa66b2bd3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7160,7 +7160,7 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_NOT_PERMITTED" type="alertmodal"> - The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set + The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set. fail - The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel + The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel. fail - The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system + The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system. fail - The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid + The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid. fail - The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request + The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request. fail - Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]" + Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]". fail - Unknown SOCKS error with server "[HOST]:[PORT]" + Unknown proxy error with server "[HOST]:[PORT]". fail - SOCKS 5 proxy settings take effect after you restart [APP_NAME]. + Proxy settings take effect after you restart [APP_NAME]. fail Date: Wed, 31 Aug 2011 13:14:12 +0300 Subject: STORM-1576 FIXED The "Show" button in agent-to-agent inventory offers didn't work. Fixed the button index, which became invalid after removing the IOR_BUSY response in the recent fix of STORM-1543 (changeset 526d86e69101). --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 104bcaf7d0..e3c649ab38 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5928,7 +5928,7 @@ An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLU [ITEM_SLURL]