diff options
Diffstat (limited to 'indra/newview/skins/default')
6 files changed, 14 insertions, 163 deletions
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 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..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,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://sl-viewer-media-system.s3.amazonaws.com/index.html"/> </button> </layout_panel> <layout_panel 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 fa15fb0657..dcd8f0b495 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -3163,7 +3163,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" 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..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, web, and texture cache" + tool_tip="Clear login image, last location, teleport history, web and texture cache" layout="topleft" left="30" name="clear_cache" 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" |