From e84e4a1adf29b3a807c9d0c0e4841b5f12ea9756 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Thu, 11 Jan 2018 10:32:23 -0800
Subject: Fix for MAINT-8177 Expose the full version of the matching
 Chromium/Chrome build for CEF in the About box

---
 indra/newview/skins/default/xui/en/floater_about.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 60f36770bb..71f4d81195 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -8,14 +8,14 @@
  help_topic="floater_about"
  save_rect="true"
  title="ABOUT [CAPITALIZED_APP_NAME]"
- width="470">
+ width="500">
   
   <tab_container
     follows="all" 
     top="25"
     left="10"
     height="405" 
-    width="450" 
+    width="480" 
     name="about_tab"
     tab_position="top">
     <panel
@@ -33,7 +33,7 @@
        max_length="65536"
        name="support_editor"
        top="5"
-       width="435"
+       width="465"
        word_wrap="true" />
       <button
         follows="left|top" 
@@ -56,7 +56,7 @@
           left="5"
           name="linden_intro"
           top="10"
-          width="435"
+          width="465"
           wrap="true">
 Second Life is brought to you by the Lindens, 
 with open source contributions from:
@@ -71,7 +71,7 @@ with open source contributions from:
        max_length="65536"
        name="contrib_names"
        top_pad="10"
-       width="435"
+       width="465"
        word_wrap="true">
 Dummy Name replaced at run time
       </text_editor>
@@ -91,7 +91,7 @@ Dummy Name replaced at run time
        max_length="65536"
        name="licenses_editor"
        top="5"
-       width="435"
+       width="465"
        word_wrap="true">
         3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
         APR Copyright (C) 2011 The Apache Software Foundation
-- 
cgit v1.2.3


From 44bea894f629c3e2c578802b978e620a0ea0b256 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 22 Jan 2018 09:28:51 -0800
Subject: MAINT-8207 Tweak web/cookie UI in viewer prefs

---
 .../skins/default/xui/en/floater_web_content.xml   | 103 +--------------------
 .../default/xui/en/panel_preferences_setup.xml     |  56 +----------
 2 files changed, 5 insertions(+), 154 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index fe9ffba6cd..83118615f9 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -178,108 +178,7 @@
         width="22">
         <button.commit_callback
           function="WebContent.TestURL"
-          parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
-      </button>
-
-      <button
-        image_overlay="Video_URL_Off"
-            image_disabled="PushButton_Disabled"
-            image_disabled_selected="PushButton_Disabled"
-            image_selected="PushButton_Selected"
-            image_unselected="PushButton_Off"
-        chrome="true"
-        tool_tip="MPEG4 Video Test"
-        enabled="true"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="27"
-        name="VLC Plugin Test"
-        top="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.TestURL"
-          parameter="https://callum-linden.s3.amazonaws.com/sample_media/ss.mp4"/>
-      </button>
-      <button
-        image_overlay="Video_URL_Off"
-            image_disabled="PushButton_Disabled"
-            image_disabled_selected="PushButton_Disabled"
-            image_selected="PushButton_Selected"
-            image_unselected="PushButton_Off"
-        chrome="true"
-        tool_tip="MKV Video Test"
-        enabled="true"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="51"
-        name="VLC Plugin Test"
-        top="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.TestURL"
-          parameter="https://callum-linden.s3.amazonaws.com/sample_media/jellyfish.mkv"/>
-      </button>
-      <button
-        image_overlay="Video_URL_Off"
-            image_disabled="PushButton_Disabled"
-            image_disabled_selected="PushButton_Disabled"
-            image_selected="PushButton_Selected"
-            image_unselected="PushButton_Off"
-        chrome="true"
-        tool_tip="WebM Video Test"
-        enabled="true"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="75"
-        name="VLC Plugin Test"
-        top="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.TestURL"
-          parameter="https://callum-linden.s3.amazonaws.com/sample_media/jumprope.webm"/>
-      </button>
-      <button
-        image_overlay="Video_URL_Off"
-            image_disabled="PushButton_Disabled"
-            image_disabled_selected="PushButton_Disabled"
-            image_selected="PushButton_Selected"
-            image_unselected="PushButton_Off"
-        chrome="true"
-        tool_tip="MP3 audio Test"
-        enabled="true"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="99"
-        name="VLC Plugin Test"
-        top="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.TestURL"
-          parameter="https://callum-linden.s3.amazonaws.com/alegria.mp3"/>
-      </button>
-      <button
-        image_overlay="Video_URL_Off"
-            image_disabled="PushButton_Disabled"
-            image_disabled_selected="PushButton_Disabled"
-            image_selected="PushButton_Selected"
-            image_unselected="PushButton_Off"
-        chrome="true"
-        tool_tip="FLV Test"
-        enabled="true"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="123"
-        name="VLC Plugin Test"
-        top="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.TestURL"
-          parameter="https://callum-linden.s3.amazonaws.com/sample_media/vandal.flv"/>
+          parameter="https://callum-linden.s3.amazonaws.com/dullahan_test_urls/index.html"/>
       </button>
     </layout_panel>
     <layout_panel
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 1d4cbca1a5..6732f4ff1c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -106,38 +106,6 @@
          width="300">
     Web:
   </text>
- <!-- <radio_group
-   control_name="UseExternalBrowser"
-   draw_border="false"
-   follows="top|left"
-   height="40"
-   layout="topleft"
-   left_delta="50"
-   name="use_external_browser"
-   top_pad="-2"
-   width="480">
-    <radio_item
-      height="20"
-      label="Use my browser (IE, Firefox, Safari)"
-      layout="topleft"
-      left_delta="0"
-      name="external"
-      value="true"
-      top="0"
-      tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
-      width="480" />
-    <radio_item
-      height="20"
-      label="Use built-in browser"
-      layout="topleft"
-      left="0"
-      name="internal"
-      value=""
-      tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
-      top_delta="20"
-      width="480" />
-  </radio_group> -->
-
   <radio_group
    control_name="PreferredBrowserBehavior"
    follows="left|top"
@@ -149,7 +117,7 @@
    width="480">
     <radio_item
       height="20"
-      label="Use my browser (Chrome, Firefox, IE) for all links"
+      label="Use the default system browser for all links"
       layout="topleft"
       left="0"
       name="internal"
@@ -159,17 +127,17 @@
       width="480" />
     <radio_item
       height="20"
-      label="Use built-in browser for Second Life links only"
+      label="Use the built-in browser for Second Life links only"
       layout="topleft"
       left_delta="0"
       name="external"
       value="1"      
-      tool_tip="Use the default system web browser for help, web links, etc. Builtin browser will be used only for LindenLab/SecondLife links."
+      tool_tip="Use the default system web browser for help, web links, etc. The built-in browser will be used only for LindenLab/Second Life links."
       top_delta="20"
       width="480" />
     <radio_item
       height="20"
-      label="Use built-in browser for all links"
+      label="Use the built-in browser for all links"
       layout="topleft"
       left="0"
       name="external_all"
@@ -193,22 +161,6 @@
     radio_style="false"
     width="400"
     top_pad="5"/>
-
-  <check_box
-   top_delta="4"
-   enabled="true"
-   follows="left|top"
-   height="14"
-   initial_value="true"
-   control_name="CookiesEnabled"
-   label="Accept cookies"
-   left_delta="0"
-   mouse_opaque="true" 
-   name="cookies_enabled"
-   radio_style="false"
-   width="400"
-   top_pad="5"/>
-  
   <check_box
     top_delta="4"
     enabled="true"
-- 
cgit v1.2.3


From 5fa704e4791c46ff94bdc3206c49d1640d251a1d Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 24 Jan 2018 13:16:07 -0800
Subject: MAINT-8232 Clear History button description should not include 'web'

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 284688d4d1..f0a059ddb2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -19,7 +19,7 @@
       follows="left|top"
       height="23"
       label="Clear History"
-      tool_tip="Clear login image, last location, teleport history, web, and texture cache"
+      tool_tip="Clear login image, last location, teleport history, and texture cache"
       layout="topleft"
       left="30"
       name="clear_cache"
@@ -41,7 +41,7 @@
       top_delta="3"
       text_color="LtGray_50"
       width="300">
-    (Locations, images, web, search history)
+    (Locations, images, search history)
   </text>
 
   <check_box
-- 
cgit v1.2.3


From ba0953c8303cfed7ed2439b2216649f1194dd3df Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Thu, 25 Jan 2018 11:29:47 -0800
Subject: MAINT-8232 Clear History button description should not include 'web'
 - incorrect assertionm that web cache not cleared

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index f0a059ddb2..2ec5cef640 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -19,7 +19,7 @@
       follows="left|top"
       height="23"
       label="Clear History"
-      tool_tip="Clear login image, last location, teleport history, and texture cache"
+      tool_tip="Clear login image, last location, teleport history, web and texture cache"
       layout="topleft"
       left="30"
       name="clear_cache"
@@ -41,7 +41,7 @@
       top_delta="3"
       text_color="LtGray_50"
       width="300">
-    (Locations, images, search history)
+    (Locations, images, web, search history)
   </text>
 
   <check_box
-- 
cgit v1.2.3


From 94f88e0121678cde7c4888d6adac9a1db1434292 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 26 Jan 2018 11:54:52 -0800
Subject: Fix for: MAINT-8138 Generate new page of test URLs for Dullahan that
 are more complete and more robust (last stage was creation of S3 non-user
 specific URL)

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 83118615f9..9a097d933b 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -178,7 +178,7 @@
         width="22">
         <button.commit_callback
           function="WebContent.TestURL"
-          parameter="https://callum-linden.s3.amazonaws.com/dullahan_test_urls/index.html"/>
+          parameter="https://sl-viewer-media-system.s3.amazonaws.com/index.html"/>
       </button>
     </layout_panel>
     <layout_panel
-- 
cgit v1.2.3


From f3e11510ddfb99a83f9f155f6957c2eca5dc2fba Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 2 Mar 2018 16:21:53 -0800
Subject: Replace start page for media browser with DuckDuckGo.com - Google
 page was offset  at that window size and was irritating

---
 indra/newview/skins/default/xui/en/menu_login.xml  | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 4e2f819023..07b3cc3bd8 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -245,7 +245,7 @@
        name="Media Browser">
         <menu_item_call.on_click
          function="Advanced.WebContentTest"
-         parameter="http://google.com"/>
+         parameter="http://duckduckgo.com"/>
       </menu_item_call>
       <menu
        create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 92511167c0..81bb83f133 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3173,7 +3173,7 @@
            shortcut="control|alt|shift|Z">
             <menu_item_call.on_click
              function="Advanced.WebContentTest"
-             parameter="http://google.com"/>
+             parameter="http://duckduckgo.com"/>
           </menu_item_call>
           <menu_item_call
            label="FB Connect Test"
-- 
cgit v1.2.3