From 00ce291f013ce434b202da675bfb38431014a077 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 17 Oct 2017 12:03:26 -0700 Subject: New prototype control for moving sun and moon in sky. --- .../default/xui/en/floater_edit_sky_preset.xml | 31 ++++++++++++++++++++-- .../skins/default/xui/en/widgets/joystick_quat.xml | 7 +++++ .../default/xui/en/widgets/joystick_rotate.xml | 4 +-- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/widgets/joystick_quat.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml index 56233d91ee..c03a206e88 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml @@ -454,7 +454,34 @@ width="200"> Sun/Moon Position - /> + + /> + + + diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml index a190da3909..cbf721b346 100644 --- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml +++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From b37eb2642f6e6e4d1e32a49c7ab31f70321cd979 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 10 Nov 2017 16:17:25 -0800 Subject: Remove delete preset dialog, Initial settings for selection level (Region/Parcel/Local) --- .../default/xui/de/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/de/menu_viewer.xml | 3 -- .../default/xui/en/floater_delete_env_preset.xml | 59 ---------------------- indra/newview/skins/default/xui/en/menu_viewer.xml | 30 ----------- .../default/xui/es/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/es/menu_viewer.xml | 3 -- .../default/xui/fr/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/fr/menu_viewer.xml | 3 -- .../default/xui/it/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/it/menu_viewer.xml | 3 -- .../default/xui/ja/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/ja/menu_viewer.xml | 3 -- .../default/xui/pl/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/pl/menu_viewer.xml | 3 -- .../default/xui/pt/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/pt/menu_viewer.xml | 3 -- .../default/xui/ru/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/ru/menu_viewer.xml | 3 -- .../default/xui/tr/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/tr/menu_viewer.xml | 3 -- .../default/xui/zh/floater_delete_env_preset.xml | 35 ------------- indra/newview/skins/default/xui/zh/menu_viewer.xml | 3 -- 22 files changed, 469 deletions(-) delete mode 100644 indra/newview/skins/default/xui/de/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml delete mode 100644 indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml deleted file mode 100644 index cc14ce640d..0000000000 --- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - Wasser-Voreinstellung löschen - - - Himmel-Voreinstellung löschen - - - Tageszyklus löschen - - - Voreinstellung: - - - Voreinstellung: - - - Tageszyklus: - - - Möchten Sie die ausgewählte Voreinstellung wirklich löschen? - - - Eine Voreinstellung, auf die sich ein Tageszyklus bezieht, kann nicht gelöscht werden. - - - -Voreinstellung auswählen- - - - Voreinstellung: - - + + + + + + + + + + + + - Time Line Goes here - + left="10" + max_sliders="20" + max_val="24" + name="WLTimeSlider" + show_text="false" + top_pad="0" + use_triangle="true" + width="525" + min_width="525"/> + + + + + + + + + + top="0"> + + + top="0"> + + + name="skip_forward" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25"> @@ -505,15 +512,6 @@ name="cancel_btn" width="100" /> - - -- cgit v1.2.3 From 2ddad24c4d5e64711cdbffd98e290d3da8e9714a Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 30 May 2018 17:08:28 -0700 Subject: Timeline behavior in day cycle edit. --- indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 2 +- indra/newview/skins/default/xui/en/menu_save_settings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index 1b07d1aa27..86c580f354 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -121,7 +121,7 @@ - + + follows="left|top" + height="15" + layout="topleft" + left="10" + name="p0" + top_pad="5" + value="0%[DSC]" + width="80" /> + follows="left|top|right" + height="15" + layout="topleft" + left_pad="39" + name="p1" + top_delta="0" + value="25%[DSC]" + width="80" /> + follows="left|top|right" + height="15" + layout="topleft" + left_pad="39" + name="p2" + top_delta="0" + value="50%[DSC]" + width="80" /> + follows="left|top|right" + height="15" + layout="topleft" + left_pad="39" + name="p3" + top_delta="0" + value="75%[DSC]" + width="80" /> + follows="left|top|right" + height="15" + layout="topleft" + left_pad="39" + name="p4" + top_delta="0" + value="100%[DSC]" + width="80" /> + decimal_digits="0" + draw_track="false" + follows="bottom" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left="10" + max_sliders="1" + max_val="1" + name="WLTimeSlider" + show_text="false" + top_pad="0" + use_triangle="true" + width="525" /> + decimal_digits="0" + follows="bottom" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left="10" + max_sliders="20" + max_val="1" + name="WLDayCycleFrames" + show_text="false" + top_pad="15" + width="525" /> + follows="left|bottom" + height="20" + layout="topleft" + left_pad="0" + name="current_time" + value="[PRCNT]%[DSC]" + top_delta="-5" + width="70" /> + name="progress_control" + follows="top|left" + height="25" + width="83" + layout="topleft" + animate="false" + left="225" + top_pad="40" + orientation="horizontal"> + name="skip_back" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25"> + name="play_layout" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25"> + name="pause_layout" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25" + visible="false"> + name="skip_forward" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25"> - - - - - - - - - - - - - - - - - - - - - + background_visible="false"> + + + - - - - - - - - - - - + + + + + + + + + + - + follows="top|left" + height="23" + width="90" + label="Clone From" + left="10" + top_pad="10" + name="copy_track" /> + - + width="83" + layout="topleft" + animate="false" + left="31" + top="40" + orientation="horizontal"> + + + + + + + + + + + + + + + + + + user_resize="false" + width="190" + height="150" + min_height="0" + visible="true"> - - + follows="top|right" + height="23" + width="90" + right="-10" + top_pad="10" + label="Add [FRAME]" + name="add_frame" /> + follows="top|left" + height="23" + width="90" + label="Load [FRAME]" + top_pad="0" + left_delta="0" + name="btn_load_frame" /> + - \ No newline at end of file + -- cgit v1.2.3 From 195f69f603613c3270050169c6a42f84307f8163 Mon Sep 17 00:00:00 2001 From: Dave Houlton Date: Fri, 24 Jan 2020 16:45:36 -0700 Subject: SL-12594, remove the Basic Shaders checkbox from the gui --- indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml | 1 - .../skins/default/xui/de/floater_preferences_graphics_advanced.xml | 1 - .../skins/default/xui/en/floater_preferences_graphics_advanced.xml | 4 +++- .../skins/default/xui/es/floater_preferences_graphics_advanced.xml | 1 - .../skins/default/xui/fr/floater_preferences_graphics_advanced.xml | 1 - .../skins/default/xui/it/floater_preferences_graphics_advanced.xml | 1 - .../skins/default/xui/ja/floater_preferences_graphics_advanced.xml | 1 - indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml | 1 - .../skins/default/xui/pt/floater_preferences_graphics_advanced.xml | 1 - .../skins/default/xui/ru/floater_preferences_graphics_advanced.xml | 1 - .../skins/default/xui/tr/floater_preferences_graphics_advanced.xml | 1 - .../skins/default/xui/zh/floater_preferences_graphics_advanced.xml | 1 - 12 files changed, 3 insertions(+), 12 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index e494b2b755..c7770eb81b 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml @@ -29,7 +29,6 @@ - diff --git a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml index 41e8dc5ef4..cd514f5afd 100644 --- a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - Niedrig diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index 70bf3f7c14..f06377f51a 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -623,6 +623,7 @@ top_delta="16" width="300" /> + + - Bajo diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml index fd47254934..42af9c526d 100644 --- a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - Faible diff --git a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml index 3773ef3711..53f9ebc6fd 100644 --- a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - Basso diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml index c28afa4c98..8ba537faa2 100644 --- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - 低 diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index 738805d800..e8c400dbd1 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml @@ -28,7 +28,6 @@ - diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml index c5039267ca..bbe36e3e03 100644 --- a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - Baixo diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml index fc6b6a173e..84e1ff15a0 100644 --- a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - Низкая diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml index 01ada1354c..c5ca997336 100644 --- a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - Düşük diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml index 7b127acd71..58314efeed 100644 --- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ - 低 -- cgit v1.2.3 From a20a506bd1a281fe5d0d54c9a59c47abed23d44a Mon Sep 17 00:00:00 2001 From: Dave Houlton Date: Wed, 29 Jan 2020 13:18:41 -0700 Subject: SL-12594, rename some lingering VertexShaderEnable variables --- .../default/xui/en/floater_preferences_graphics_advanced.xml | 12 ++++++------ .../skins/default/xui/en/panel_preferences_graphics1.xml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index f06377f51a..ce219069e7 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -609,7 +609,7 @@ top_delta="16" width="300"> + function="Pref.RenderOptionUpdate" /> + function="Pref.RenderOptionUpdate" /> + function="Pref.RenderOptionUpdate" /> + function="Pref.RenderOptionUpdate" /> + function="Pref.RenderOptionUpdate" /> + function="Pref.RenderOptionUpdate" /> - ([HH]:[MM]) + ([HH]:[MM]) Sky [ALT] Sky Water @@ -185,44 +185,44 @@ left="10" name="p0" top_pad="5" - value="0%[DSC]" - width="80" /> + value="0% [DSC]" + width="90" /> + value="25% [DSC]" + width="90" /> + value="50% [DSC]" + width="90" /> + value="75% [DSC]" + width="90" /> + value="100% [DSC]" + width="90" /> + width="56" + word_wrap="true"/> Date: Tue, 25 Feb 2020 20:23:12 +0200 Subject: SL-12755 [EEP] The sky level dropdown was not disabled by default --- indra/newview/skins/default/xui/en/floater_settings_picker.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml index 132d23492f..c6136904cf 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -107,6 +107,7 @@ max_chars="100" mouse_opaque="true" name="track_selection" + enabled="false" top="1" width="190"/> -- cgit v1.2.3 From dbf464e0fd0df27c18b78a77004b40a8477e0c31 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 25 Feb 2020 20:43:15 +0200 Subject: SL-12754 Fixed search field --- indra/newview/skins/default/xui/en/floater_settings_picker.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml index c6136904cf..3a26c3b547 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -58,7 +58,7 @@ Date: Tue, 25 Feb 2020 18:56:11 +0000 Subject: SL-12757 - typo in menu_viewer.xml --- indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b1d44302f9..2c9bf99fe2 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1337,7 +1337,7 @@ function="File.VisibleUploadModel"/> Date: Wed, 4 Mar 2020 14:58:55 +0200 Subject: SL-12562 Change events URL --- indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 04b5d808ec..6284fe9a4d 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -461,7 +461,7 @@ name="Events"> + parameter="https://secondlife.com/my/community/events"/> confirm - http://secondlife.com/events/ + https://secondlife.com/my/community/events Date: Tue, 10 Mar 2020 16:33:55 +0200 Subject: SL-12817 New text for snapshot upload --- .../default/xui/en/panel_outfit_snapshot_inventory.xml | 6 ++++-- .../skins/default/xui/en/panel_snapshot_inventory.xml | 2 +- .../skins/default/xui/en/panel_snapshot_options.xml | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml index ace0ee01e2..441cf97e87 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml @@ -41,7 +41,7 @@ - Uploading an image to your inventory costs L$[UPLOAD_COST]. +Uploading an image to your inventory costs L$[UPLOAD_COST]. + +Fee is based on your subscription level. Higher levels are charged lower fees. + + Fee is based on your subscription level. Higher levels are charged lower fees. + \ No newline at end of file -- cgit v1.2.3 From 13c8496799581ad88d4ef1f1dd84bcbf331edb5b Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 10 Mar 2020 23:29:32 +0200 Subject: SL-12779 [EEP] Fix for cropped buttons in 'Edit Day Cycle' floater --- indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.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/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index 6869eefda2..30e9002230 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -260,7 +260,7 @@ Date: Tue, 17 Mar 2020 16:38:55 +0200 Subject: SL-12858 Fixed bad merge --- indra/newview/skins/default/xui/de/floater_about_land.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index 8fb953d3ab..8f55b3297f 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -370,8 +370,8 @@ Nur große Parzellen können in der Suche aufgeführt werden. Landepunkt: [LANDING] -