MAINT-8207 Tweak web/cookie UI in viewer prefs

Mon, 22 Jan 2018 09:28:51 -0800

author
callum_linden
date
Mon, 22 Jan 2018 09:28:51 -0800
changeset 55065
ef56b3cc4359
parent 55064
5bdd7af0fe93
child 55066
a7c49a98e9f6

MAINT-8207 Tweak web/cookie UI in viewer prefs

indra/newview/skins/default/xui/en/floater_web_content.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_preferences_setup.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml	Fri Jan 19 15:37:27 2018 -0800
     1.2 +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml	Mon Jan 22 09:28:51 2018 -0800
     1.3 @@ -178,108 +178,7 @@
     1.4          width="22">
     1.5          <button.commit_callback
     1.6            function="WebContent.TestURL"
     1.7 -          parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
     1.8 -      </button>
     1.9 -
    1.10 -      <button
    1.11 -        image_overlay="Video_URL_Off"
    1.12 -            image_disabled="PushButton_Disabled"
    1.13 -            image_disabled_selected="PushButton_Disabled"
    1.14 -            image_selected="PushButton_Selected"
    1.15 -            image_unselected="PushButton_Off"
    1.16 -        chrome="true"
    1.17 -        tool_tip="MPEG4 Video Test"
    1.18 -        enabled="true"
    1.19 -        follows="left|top"
    1.20 -        height="22"
    1.21 -        layout="topleft"
    1.22 -        left="27"
    1.23 -        name="VLC Plugin Test"
    1.24 -        top="0"
    1.25 -        width="22">
    1.26 -        <button.commit_callback
    1.27 -          function="WebContent.TestURL"
    1.28 -          parameter="https://callum-linden.s3.amazonaws.com/sample_media/ss.mp4"/>
    1.29 -      </button>
    1.30 -      <button
    1.31 -        image_overlay="Video_URL_Off"
    1.32 -            image_disabled="PushButton_Disabled"
    1.33 -            image_disabled_selected="PushButton_Disabled"
    1.34 -            image_selected="PushButton_Selected"
    1.35 -            image_unselected="PushButton_Off"
    1.36 -        chrome="true"
    1.37 -        tool_tip="MKV Video Test"
    1.38 -        enabled="true"
    1.39 -        follows="left|top"
    1.40 -        height="22"
    1.41 -        layout="topleft"
    1.42 -        left="51"
    1.43 -        name="VLC Plugin Test"
    1.44 -        top="0"
    1.45 -        width="22">
    1.46 -        <button.commit_callback
    1.47 -          function="WebContent.TestURL"
    1.48 -          parameter="https://callum-linden.s3.amazonaws.com/sample_media/jellyfish.mkv"/>
    1.49 -      </button>
    1.50 -      <button
    1.51 -        image_overlay="Video_URL_Off"
    1.52 -            image_disabled="PushButton_Disabled"
    1.53 -            image_disabled_selected="PushButton_Disabled"
    1.54 -            image_selected="PushButton_Selected"
    1.55 -            image_unselected="PushButton_Off"
    1.56 -        chrome="true"
    1.57 -        tool_tip="WebM Video Test"
    1.58 -        enabled="true"
    1.59 -        follows="left|top"
    1.60 -        height="22"
    1.61 -        layout="topleft"
    1.62 -        left="75"
    1.63 -        name="VLC Plugin Test"
    1.64 -        top="0"
    1.65 -        width="22">
    1.66 -        <button.commit_callback
    1.67 -          function="WebContent.TestURL"
    1.68 -          parameter="https://callum-linden.s3.amazonaws.com/sample_media/jumprope.webm"/>
    1.69 -      </button>
    1.70 -      <button
    1.71 -        image_overlay="Video_URL_Off"
    1.72 -            image_disabled="PushButton_Disabled"
    1.73 -            image_disabled_selected="PushButton_Disabled"
    1.74 -            image_selected="PushButton_Selected"
    1.75 -            image_unselected="PushButton_Off"
    1.76 -        chrome="true"
    1.77 -        tool_tip="MP3 audio Test"
    1.78 -        enabled="true"
    1.79 -        follows="left|top"
    1.80 -        height="22"
    1.81 -        layout="topleft"
    1.82 -        left="99"
    1.83 -        name="VLC Plugin Test"
    1.84 -        top="0"
    1.85 -        width="22">
    1.86 -        <button.commit_callback
    1.87 -          function="WebContent.TestURL"
    1.88 -          parameter="https://callum-linden.s3.amazonaws.com/alegria.mp3"/>
    1.89 -      </button>
    1.90 -      <button
    1.91 -        image_overlay="Video_URL_Off"
    1.92 -            image_disabled="PushButton_Disabled"
    1.93 -            image_disabled_selected="PushButton_Disabled"
    1.94 -            image_selected="PushButton_Selected"
    1.95 -            image_unselected="PushButton_Off"
    1.96 -        chrome="true"
    1.97 -        tool_tip="FLV Test"
    1.98 -        enabled="true"
    1.99 -        follows="left|top"
   1.100 -        height="22"
   1.101 -        layout="topleft"
   1.102 -        left="123"
   1.103 -        name="VLC Plugin Test"
   1.104 -        top="0"
   1.105 -        width="22">
   1.106 -        <button.commit_callback
   1.107 -          function="WebContent.TestURL"
   1.108 -          parameter="https://callum-linden.s3.amazonaws.com/sample_media/vandal.flv"/>
   1.109 +          parameter="https://callum-linden.s3.amazonaws.com/dullahan_test_urls/index.html"/>
   1.110        </button>
   1.111      </layout_panel>
   1.112      <layout_panel
     2.1 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml	Fri Jan 19 15:37:27 2018 -0800
     2.2 +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml	Mon Jan 22 09:28:51 2018 -0800
     2.3 @@ -106,38 +106,6 @@
     2.4           width="300">
     2.5      Web:
     2.6    </text>
     2.7 - <!-- <radio_group
     2.8 -   control_name="UseExternalBrowser"
     2.9 -   draw_border="false"
    2.10 -   follows="top|left"
    2.11 -   height="40"
    2.12 -   layout="topleft"
    2.13 -   left_delta="50"
    2.14 -   name="use_external_browser"
    2.15 -   top_pad="-2"
    2.16 -   width="480">
    2.17 -    <radio_item
    2.18 -      height="20"
    2.19 -      label="Use my browser (IE, Firefox, Safari)"
    2.20 -      layout="topleft"
    2.21 -      left_delta="0"
    2.22 -      name="external"
    2.23 -      value="true"
    2.24 -      top="0"
    2.25 -      tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
    2.26 -      width="480" />
    2.27 -    <radio_item
    2.28 -      height="20"
    2.29 -      label="Use built-in browser"
    2.30 -      layout="topleft"
    2.31 -      left="0"
    2.32 -      name="internal"
    2.33 -      value=""
    2.34 -      tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
    2.35 -      top_delta="20"
    2.36 -      width="480" />
    2.37 -  </radio_group> -->
    2.38 -
    2.39    <radio_group
    2.40     control_name="PreferredBrowserBehavior"
    2.41     follows="left|top"
    2.42 @@ -149,7 +117,7 @@
    2.43     width="480">
    2.44      <radio_item
    2.45        height="20"
    2.46 -      label="Use my browser (Chrome, Firefox, IE) for all links"
    2.47 +      label="Use the default system browser for all links"
    2.48        layout="topleft"
    2.49        left="0"
    2.50        name="internal"
    2.51 @@ -159,17 +127,17 @@
    2.52        width="480" />
    2.53      <radio_item
    2.54        height="20"
    2.55 -      label="Use built-in browser for Second Life links only"
    2.56 +      label="Use the built-in browser for Second Life links only"
    2.57        layout="topleft"
    2.58        left_delta="0"
    2.59        name="external"
    2.60        value="1"      
    2.61 -      tool_tip="Use the default system web browser for help, web links, etc. Builtin browser will be used only for LindenLab/SecondLife links."
    2.62 +      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."
    2.63        top_delta="20"
    2.64        width="480" />
    2.65      <radio_item
    2.66        height="20"
    2.67 -      label="Use built-in browser for all links"
    2.68 +      label="Use the built-in browser for all links"
    2.69        layout="topleft"
    2.70        left="0"
    2.71        name="external_all"
    2.72 @@ -193,22 +161,6 @@
    2.73      radio_style="false"
    2.74      width="400"
    2.75      top_pad="5"/>
    2.76 -
    2.77 -  <check_box
    2.78 -   top_delta="4"
    2.79 -   enabled="true"
    2.80 -   follows="left|top"
    2.81 -   height="14"
    2.82 -   initial_value="true"
    2.83 -   control_name="CookiesEnabled"
    2.84 -   label="Accept cookies"
    2.85 -   left_delta="0"
    2.86 -   mouse_opaque="true" 
    2.87 -   name="cookies_enabled"
    2.88 -   radio_style="false"
    2.89 -   width="400"
    2.90 -   top_pad="5"/>
    2.91 -  
    2.92    <check_box
    2.93      top_delta="4"
    2.94      enabled="true"

mercurial