From c705126d0be0b6a60d0e8e23bf8919e08e0db967 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 14 May 2021 15:21:06 -0700
Subject: Fixes SL-14897 Disable Flash support in the embedded browser

---
 .../skins/default/xui/en/panel_preferences_setup.xml       | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 6732f4ff1c..89a5a5ca6f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -147,20 +147,6 @@
       width="480" />
   </radio_group>
 
-  <check_box
-    top_delta="2"
-    enabled="true"
-    follows="left|top"
-    height="18"
-    initial_value="true"
-    control_name="BrowserPluginsEnabled"
-    label="Enable plugins"
-    left_delta="20"
-    mouse_opaque="true"
-    name="browser_plugins_enabled"
-    radio_style="false"
-    width="400"
-    top_pad="5"/>
   <check_box
     top_delta="4"
     enabled="true"
-- 
cgit v1.2.3


From 4158e69141cd59c9b1c669fa0eea8c3d95b74132 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 19 May 2021 16:21:58 -0700
Subject: Fix for SL-12320 The Viewer functionality is broken with an in-viewer
 enabled proxy - there isn't an obvious way to set proxy information for CEF
 alone and QA asserts that the system setting is used so we are removing the
 proxy UI from the preferences floater. I purposely left everything else in
 place (config floater, media plugin messages etc.) so we can consider adding
 CEF specific support one day.

---
 .../default/xui/en/panel_preferences_setup.xml     | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 89a5a5ca6f..27beb3937c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -229,22 +229,21 @@
      left="30"
      name="Proxy Settings:"
      mouse_opaque="false"
+     top_pad="10"
+     width="300">
+    Proxy Settings:
+  </text>
+  <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="80"
+     name="Proxy Settings:"
+     mouse_opaque="false"
      top_pad="5"
      width="300">
-		Proxy Settings:
+    Your system's existing proxy settings will be used
   </text>
-  <button
-	label="Adjust proxy settings"
-    follows="left|top"
-    height="23"
-	width="140" 
-    label_selected="Browse"
-    layout="topleft"
-    left_delta="50"
-    name="set_proxy"
-    top_pad="5"
-    >
-		<button.commit_callback
-		  function="Pref.Proxy" />
-  </button>
 </panel>
-- 
cgit v1.2.3


From 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@mbp.local>
Date: Tue, 25 May 2021 09:40:13 -0700
Subject: Fix duplicate name is XML (FS:Ansarial)

---
 indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 27beb3937c..dff6f6e600 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -227,7 +227,7 @@
      height="10"
      layout="topleft"
      left="30"
-     name="Proxy Settings:"
+     name="Proxy Settings 1"
      mouse_opaque="false"
      top_pad="10"
      width="300">
@@ -240,7 +240,7 @@
      height="10"
      layout="topleft"
      left="80"
-     name="Proxy Settings:"
+     name="Proxy Settings 2"
      mouse_opaque="false"
      top_pad="5"
      width="300">
-- 
cgit v1.2.3