From 873a92785f4688e37ba5be54d7e7123988aefc03 Mon Sep 17 00:00:00 2001 From: Northspring Date: Fri, 26 Sep 2014 22:26:56 +0200 Subject: Polish translation update for viewer-release 3.7.17: Removing redundant files not present in /en/ directory (1/3) --- .../default/xui/pl/floater_animation_preview.xml | 187 --------------------- .../skins/default/xui/pl/floater_inventory.xml | 16 -- .../skins/default/xui/pl/floater_nearby_chat.xml | 4 - .../skins/default/xui/pl/floater_perm_prefs.xml | 16 -- .../skins/default/xui/pl/floater_postcard.xml | 36 ---- .../default/xui/pl/floater_voice_controls.xml | 30 ---- .../skins/default/xui/pl/menu_bottomtray.xml | 17 -- .../default/xui/pl/menu_inspect_avatar_gear.xml | 21 --- .../default/xui/pl/menu_inspect_self_gear.xml | 31 ---- .../xui/pl/menu_people_friends_view_sort.xml | 8 - .../xui/pl/menu_people_groups_view_sort.xml | 5 - .../xui/pl/menu_people_nearby_view_sort.xml | 8 - .../xui/pl/menu_people_recent_view_sort.xml | 7 - .../default/xui/pl/panel_adhoc_control_panel.xml | 14 -- .../skins/default/xui/pl/panel_bottomtray.xml | 47 ------ .../default/xui/pl/panel_group_control_panel.xml | 17 -- .../default/xui/pl/panel_im_control_panel.xml | 29 ---- .../skins/default/xui/pl/panel_region_texture.xml | 57 ------- .../skins/default/xui/pl/panel_side_tray.xml | 29 ---- 19 files changed, 579 deletions(-) delete mode 100755 indra/newview/skins/default/xui/pl/floater_animation_preview.xml delete mode 100755 indra/newview/skins/default/xui/pl/floater_inventory.xml delete mode 100755 indra/newview/skins/default/xui/pl/floater_nearby_chat.xml delete mode 100755 indra/newview/skins/default/xui/pl/floater_perm_prefs.xml delete mode 100755 indra/newview/skins/default/xui/pl/floater_postcard.xml delete mode 100755 indra/newview/skins/default/xui/pl/floater_voice_controls.xml delete mode 100755 indra/newview/skins/default/xui/pl/menu_bottomtray.xml delete mode 100755 indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml delete mode 100755 indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml delete mode 100755 indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml delete mode 100755 indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml delete mode 100755 indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml delete mode 100755 indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml delete mode 100755 indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml delete mode 100755 indra/newview/skins/default/xui/pl/panel_bottomtray.xml delete mode 100755 indra/newview/skins/default/xui/pl/panel_group_control_panel.xml delete mode 100755 indra/newview/skins/default/xui/pl/panel_im_control_panel.xml delete mode 100755 indra/newview/skins/default/xui/pl/panel_region_texture.xml delete mode 100755 indra/newview/skins/default/xui/pl/panel_side_tray.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml deleted file mode 100755 index 3402d8d31f..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - Inicjalizacja ruchu nie powiodła się. - - - Długość pliku animacji wynosi [LENGTH] sekund. - -Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. - - - Brak możliwości odczytania plików animacji do wyświetlenia. - -[STATUS] - - - Ok - - - Niewłaściwe zakończenie nazwy pliku. - - - Brak możliwości wyświetlenia definicji ograniczenia. - - - Plik BVH nie może zostać otworzony. - - - Niewłaściwy nagłówek HIERARCHII. - - - ROOT oraz JOINT nieodnalezione. - - - Brak nazwy JOINT. - - - OFFSET nieodnalezione. - - - CHANNELS nieodnalezione. - - - Brak otrzymania kolejności obrotu. - - - Brak osi obrotu. - - - MOTION nieodnalezione. - - - Brak otrzymania liczby klatek obrazu. - - - Brak otrzymania czasu dla ilości klatek obrazu. - - - Brak otrzymania wartości pozycji. - - - Nie można odczytać wartości obrotu. - - - Nie można otworzyć pliku tłumaczenia. - - - Nie można przeczytać tłumaczenia nagłówka. - - - Nie można przetłumaczyć nazw. - - - Nie można przeczytać tłumaczenia dla wartości ignorowania. - - - Nie można przeczytać tłumaczenia wartości relatywnej. - - - Nie można przeczytać nazw wartości tłumaczenia. - - - Nie można przeczytać tłumaczenia pola. - - - Brak otrzymania nazwy dla mergechild. - - - Brak otrzymania nazwy dla mergeparent. - - - Brak wartości prerogatywy. - - - Brak otrzymania wartości powtórzeń. - - - Brak otrzymawnia wartości easeIn. - - - Brak otrzymania wartości dla easeOut. - - - Brak otrzymania wartości morfizacji. - - - Nie można odczytać nazwy emocji. - - - Nieprawidłowa nazwa, użyj "hip". - - - Nazwa: - - - Opis: - - - - - - - Pozycja ręki - - - - - - - - - - - - - - - - - - Ekspresja - - - - - - - - - - - - - - - - - - - - - - - - - Przeglądaj kiedy: - - - - - - - - - - - + Godzin - + Dni - - + + + + + + + -- cgit v1.2.3 From 42821c7c54ff2eed5327262bf26b28ad429ee1d3 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 25 Nov 2014 09:02:28 -0500 Subject: STORM-2082 Small fix for button highlighting issue --- indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 72976deaed..955c0f1a41 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -168,6 +168,7 @@ control_name="ShowAdvancedGraphicsSettings" enabled_control="ShowAdvancedGraphicsSettings" is_toggle="true" + image_selected="PushButton_Off" follows="top|left" height="23" label="Basic Settings" @@ -180,6 +181,7 @@ control_name="ShowAdvancedGraphicsSettings" disabled_control="ShowAdvancedGraphicsSettings" is_toggle="true" + image_disabled_selected="PushButton_Disabled" follows="top|left" height="23" label="Advanced Settings" -- cgit v1.2.3 From ea0216f67c12195aadb1993180c28c43b04294bd Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 25 Nov 2014 16:33:53 -0500 Subject: STORM-2082 Add tab containers, remove buttons and obsolete debug setting --- .../xui/en/menu_preferences_graphics_gear.xml | 21 - .../default/xui/en/panel_preferences_graphics1.xml | 1467 ++++++++++---------- .../skins/default/xui/en/panel_status_bar.xml | 11 +- 3 files changed, 757 insertions(+), 742 deletions(-) delete mode 100644 indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml b/indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml deleted file mode 100644 index 0e0f8f6865..0000000000 --- a/indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 955c0f1a41..0a7cc995c7 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -20,8 +20,8 @@ left="5" name="label" top="10" - width="120"> - Graphic Presets: + width="60"> + Presets: - - - + width="115"> + + + - + function="Pref.QualityPerformance"/> + - - - + + + + diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 064ece6e4b..a1f7503269 100755 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -35,7 +35,7 @@ 24:00 AM PST + + + Graphic Presets + + diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index a1f7503269..bb38c384a8 100755 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -105,14 +105,13 @@ width="145"> 24:00 AM PST - Loading... - + + + -None saved yet- + -- cgit v1.2.3 From 6d1296f71640c9c25affcff4e784ea5798ba2d5c Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 1 Dec 2014 08:09:17 -0500 Subject: STORM-2082 Implement save floater and some code cleanup. --- .../default/xui/en/floater_save_pref_preset.xml | 50 ++++++++++++++++++++++ .../newview/skins/default/xui/en/notifications.xml | 14 ++++++ .../default/xui/en/panel_preferences_graphics1.xml | 6 ++- 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/floater_save_pref_preset.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml new file mode 100644 index 0000000000..5919d9e3d7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml @@ -0,0 +1,50 @@ + + + + Save Graphic Preset + Save Camera Preset + + + Preset: + + + + diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml index 697bfd58e7..652d85656c 100644 --- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml @@ -12,29 +12,60 @@ layout="topleft" name="presets_pulldown" width="225"> - Graphic Presets + + + + + + + -- cgit v1.2.3 From 6c534dff5f30e503d6f5b63cdeeb4c0e2a29ae28 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 3 Dec 2014 10:10:42 -0500 Subject: remove obsolete menu entries in favor of integrated render info display --- indra/newview/skins/default/xui/en/menu_viewer.xml | 20 -------------------- 1 file changed, 20 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 21e15ba270..c96a0366ca 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2658,26 +2658,6 @@ - - - - - - - - Date: Thu, 4 Dec 2014 14:27:15 -0500 Subject: STORM-2082 Revert name of Reset button from Undo back to Reset. Hopefully this will be renamed Recommended Settings. Display a test icon (artwork needed) in the pulldown panel --- .../skins/default/xui/en/panel_preferences_graphics1.xml | 16 ++-------------- .../skins/default/xui/en/panel_presets_pulldown.xml | 8 +++----- 2 files changed, 5 insertions(+), 19 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 6df4a4f2ea..24f3dd803f 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -37,7 +37,7 @@ - diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml index fdcbce05d2..b87dda2315 100644 --- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml @@ -2,8 +2,8 @@ Date: Fri, 12 Dec 2014 11:13:11 -0500 Subject: STORM-2082 Merge Hardware floater into main graphics preferences display Change notifications so they are emitted only when an error occurs Put active preset at top of list Add Maximum ARC slider Merge two small methods into slider update code --- .../newview/skins/default/xui/en/notifications.xml | 8 +- .../default/xui/en/panel_preferences_graphics1.xml | 218 +++++++++++++++++++-- indra/newview/skins/default/xui/en/strings.xml | 3 +- 3 files changed, 209 insertions(+), 20 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1618ea0ec7..340777faf3 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7659,16 +7659,16 @@ Attachment has been saved. -Preset [NAME] has been saved. +Error saving preset [NAME]. -Preset [NAME] has been deleted. +Error deleting preset [NAME]. + + + + + Low + + None + + + Hardware + + + + + + + + + + (0 = default brightness, lower = brighter) + + + + + + + + + + Antialiasing: + + + + + + + + + + (requires viewer restart) + @@ -958,18 +1158,6 @@ - + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 1c655c6559..023c6e5bbb 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4044,5 +4044,6 @@ Try enclosing path to the editor with double quotes. -Empty list- - + Default + Off -- cgit v1.2.3 From e713ef765f268af1cba0f7b04f1e331332630e97 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sat, 13 Dec 2014 06:28:12 -0500 Subject: STORM-2082 Write out settings to preset file if settings changed on the login page Code improvements from bitbucket comments --- indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 43b9d6003f..4636313f94 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -550,13 +550,13 @@ follows="left|top" height="16" initial_value="0" - increment=".1" + increment="1" label="Maximum ARC:" label_width="185" layout="topleft" left="30" min_val="0" - max_val="13" + max_val="100" name="MaximumARC" show_text="false" top_delta="16" @@ -1158,6 +1158,5 @@ - -- cgit v1.2.3 From c655ae00a1e9d3540a9280181766bd4f646e1cce Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sat, 13 Dec 2014 20:53:27 -0500 Subject: STORM-2082 When a control is greyed out make sure it's associated text is greyed out. Sky: has two dependencies; grey it out when either one is not available. Remove Basic Shaders from Basic tab --- .../default/xui/en/panel_preferences_graphics1.xml | 26 ++++++---------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 4636313f94..a53097a117 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -264,28 +264,13 @@ Low - - - - @@ -438,7 +423,7 @@ width="300" > + parameter="TerrainDetail" /> Low @@ -629,6 +615,7 @@ height="16" layout="topleft" name="TerrainMeshDetailText" + text_readonly_color="LabelDisabledColor" top_delta="0" left_delta="304" width="128"> @@ -844,6 +831,7 @@ height="16" layout="topleft" name="ReflectionsText" + text_readonly_color="LabelDisabledColor" top_delta="0" left_delta="284" width="128"> @@ -866,7 +854,6 @@ Low @@ -970,6 +957,7 @@ layout="topleft" left_delta="264" name="RenderShadowDetailText" + text_readonly_color="LabelDisabledColor" top_delta="0" width="128"> None -- cgit v1.2.3 From 20828d7f8fa29a92a9e2141a2373ac99bf44057e Mon Sep 17 00:00:00 2001 From: Northspring Date: Fri, 19 Dec 2014 23:35:45 +0100 Subject: Updated Polish translation up to 3.7.24 --- .../skins/default/xui/pl/floater_openobject.xml | 9 ++++++-- indra/newview/skins/default/xui/pl/floater_pay.xml | 23 +++++++++++++------- .../skins/default/xui/pl/floater_pay_object.xml | 25 ++++++++++++++-------- indra/newview/skins/default/xui/pl/menu_viewer.xml | 1 + .../newview/skins/default/xui/pl/notifications.xml | 4 ++++ indra/newview/skins/default/xui/pl/strings.xml | 9 ++++++++ 6 files changed, 52 insertions(+), 19 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml index 653f7b4824..f27e4ff858 100755 --- a/indra/newview/skins/default/xui/pl/floater_openobject.xml +++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml @@ -1,5 +1,10 @@ - + + + + + + General @@ -471,14 +499,14 @@ control_name="MaximumARC" follows="left|top" height="16" - initial_value="0" + initial_value="101" increment="1" label="Maximum ARC:" label_width="165" layout="topleft" left="50" - min_val="0" - max_val="100" + min_val="1" + max_val="101" name="MaximumARC" show_text="false" top_delta="16" @@ -1185,14 +1213,15 @@ diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 023c6e5bbb..c09129c867 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4046,4 +4046,5 @@ Try enclosing path to the editor with double quotes. -Empty list- Default Off + (None) -- cgit v1.2.3 From 56f43a390015f3ba721554ef9a0e436b6bfad5f9 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 20 Jan 2015 13:35:26 -0500 Subject: STORM-2082 Still trying to work out the dirtyChilds issue. Also made some small UI adjustments. --- .../default/xui/en/panel_preferences_graphics1.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index b5a1c1eda6..6bc549ce94 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -235,7 +235,8 @@ @@ -254,7 +255,7 @@ layout="topleft" mouse_opaque="false" name="Basic" - top="30" + top="10" width="517"> + + + General + + + + + m + + + + + + + + + Low + + + + Avatar + + + + + + + 0 + + + + + + + 0 + + + + + + + Low + + + + + + + Low + + + + Shaders + + + + + + + + + + + + + + + + + + + Low + + + + + + + + + + Water Reflections: + + + + + + + + + + + + + + + + + + Low + + + + + + + + + + + + + + + + Shadows: + + + + + + + + + Mesh + + + + + + + Low + + + + + + + Low + + + + + + + Low + + + + + + + Low + + + + Hardware + + + + + + + + + (0 = default brightness, lower = brighter) + + + + + + + + + + Antialiasing: + + + + + + + + + + (requires viewer restart) + + + + diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 756c765bbd..5d4bfdd17f 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -10,7 +10,6 @@ top="1" width="517"> - - - - - - - - - - - m - + - - - + + + m + - - - + + + + + + + - - - - - - - - - - - - General - - - - - m - - - - - - - - - Low - - - - Avatar - - - - - - - 0 - - - - - - - 0 - - - - - - - Low - - - - - - - Low - - - - Shaders - - - - - - - - - - - - - - - - - - - Low - - - - - - - - - - Water Reflections: - - - - - - - - - - - - - - - - - - Low - - - - - - - - - - - - - - - - Shadows: - - - - - - - - - Mesh - - - - - - - Low - - - - - - - Low - - - - - - - Low - - - - - - - Low - - - - Hardware - - - - - - - - - (0 = default brightness, lower = brighter) - - - - - - - - - - Antialiasing: - - - - - - - - - - (requires viewer restart) - - - - - + - - + -- cgit v1.2.3 From 7b8206476466a33235f6300152645493e18be357 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 18 Feb 2015 17:22:56 -0500 Subject: STORM-2082 Advanced floater xml adjustments --- .../en/floater_preferences_graphics_advanced.xml | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 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 981a30b436..01a5e36ab0 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 @@ -7,7 +7,7 @@ single_instance="true" save_rect="true" title="ADVANCED GRAPHICS PREFERENCES" - width="450"> + width="400"> @@ -32,7 +32,7 @@ layout="topleft" name="GeneralText" top_delta="35" - left="5" + left="10" width="128"> General @@ -62,7 +62,7 @@ name="DrawDistanceMeterText2" top_delta="0" left_delta="330" - width="102"> + width="20"> m @@ -112,7 +112,7 @@ name="PostProcessText" top_delta="0" left_delta="304" - width="128"> + width="65"> Low @@ -124,7 +124,7 @@ layout="topleft" name="AvatarText" top_delta="20" - left="5" + left="10" width="128"> Avatar @@ -159,7 +159,7 @@ left_delta="304" text_readonly_color="LabelDisabledColor" name="MaximumARCText" - width="128"> + width="65"> 0 @@ -194,7 +194,7 @@ left_delta="304" text_readonly_color="LabelDisabledColor" name="ImpostorsText" - width="128"> + width="65"> 0 @@ -225,7 +225,7 @@ name="AvatarMeshDetailText" top_delta="0" left_delta="304" - width="128"> + width="65"> Low @@ -256,7 +256,7 @@ top_delta="0" left_delta="304" name="AvatarPhysicsDetailText" - width="128"> + width="65"> Low @@ -268,7 +268,7 @@ layout="topleft" name="ShadersText" top_delta="20" - left="5" + left="10" width="128"> Shaders @@ -354,7 +354,7 @@ left_delta="284" name="TerrainDetailText" text_readonly_color="LabelDisabledColor" - width="128"> + width="65"> Low @@ -471,7 +471,7 @@ name="SkyMeshDetailText" text_readonly_color="LabelDisabledColor" top_delta="0" - width="128"> + width="65"> Low @@ -560,7 +560,7 @@ layout="topleft" name="AvatarText" top_delta="20" - left="5" + left="10" width="128"> Mesh @@ -595,7 +595,7 @@ text_readonly_color="LabelDisabledColor" top_delta="0" left_delta="304" - width="128"> + width="65"> Low @@ -626,7 +626,7 @@ name="TreeMeshDetailText" top_delta="0" left_delta="304" - width="128"> + width="65"> Low @@ -658,7 +658,7 @@ name="ObjectMeshDetailText" top_delta="0" left_delta="304" - width="128"> + width="65"> Low @@ -688,7 +688,7 @@ name="FlexibleMeshDetailText" top_delta="0" left_delta="304" - width="128"> + width="65"> Low @@ -700,7 +700,7 @@ layout="topleft" name="ShadersText" top_delta="20" - left="5" + left="10" width="128"> Hardware @@ -764,7 +764,7 @@ left="30" name="(brightness, lower is brighter)" top_delta="16" - width="230"> + width="260"> (0 = default brightness, lower = brighter) @@ -854,8 +854,8 @@ left_pad="10" name="antialiasing restart" top_delta="0" - width="190"> - (requires viewer restart) + width="130"> + (requires restart) -- cgit v1.2.3 From c598094d153c36b7b1c5504c460e3e4a750e947e Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 20 Feb 2015 09:21:18 -0500 Subject: STORM-2082 Remove obsolete xml file --- .../default/xui/en/floater_hardware_settings.xml | 198 --------------------- 1 file changed, 198 deletions(-) delete mode 100755 indra/newview/skins/default/xui/en/floater_hardware_settings.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml deleted file mode 100755 index 9deb0d2030..0000000000 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - Filtering: - - - - Antialiasing: - - - - - - - - - - (requires viewer restart) - - - - (0 = default brightness, lower = brighter) - - - Enable VBO: - - - - Enable S3TC: - - - - - - General @@ -859,4 +846,45 @@ + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 5d4bfdd17f..a94907f0c9 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -233,12 +233,12 @@ -- cgit v1.2.3 From 1b7c00b558c55dd2c7a8edd8a82632dcb1219fce Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sun, 22 Feb 2015 10:19:41 -0500 Subject: STORM-2082 Rearrange Reset, load, save, delete buttons. Make load, save, and delete floaters close when preferences floater closes. --- .../default/xui/en/panel_preferences_graphics1.xml | 107 +++++++++++---------- 1 file changed, 54 insertions(+), 53 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index a94907f0c9..6cf9045f2a 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -31,34 +31,6 @@ (None) - - - - - - + + + + + + + -- cgit v1.2.3 From 72f832ba8dba0e843601b70b8ef80f40c564240f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sun, 22 Feb 2015 10:32:07 -0500 Subject: STORM-2082 Change case of Maximum complexity --- .../skins/default/xui/en/floater_preferences_graphics_advanced.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/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index 9c6589d466..054337dfc0 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 @@ -122,7 +122,7 @@ height="16" initial_value="101" increment="1" - label="Maximum Complexity:" + label="Maximum complexity:" label_width="185" layout="topleft" left="30" -- cgit v1.2.3 From b011afaa81608c1d1c19bfa808bf9c2b99e8e5c8 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 23 Feb 2015 19:09:56 -0500 Subject: STORM-2082 Clicking on Ok/Cancel in Advanced floater only closes it now --- .../skins/default/xui/en/floater_preferences_graphics_advanced.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 054337dfc0..3f68efdc70 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 @@ -870,7 +870,8 @@ top_delta="0" width="80"> + function="Pref.OK" + parameter="closeadvanced" /> -- cgit v1.2.3 From 45c62ff8421467f5b63d8be2f9adfb6341675e28 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 24 Feb 2015 16:45:10 -0500 Subject: STORM-2082 Add non-displaying xml entries for RenderAvatarMax{Complexity, NonImpostors} so those values are saved in a preset file. --- .../en/floater_preferences_graphics_advanced.xml | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) (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 3f68efdc70..25576fe643 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 @@ -889,4 +889,29 @@ parameter="closeadvanced" /> + + + + + + -- cgit v1.2.3 From a8530e8b193f58109fa939fc57d079e3fcd0430c Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 25 Feb 2015 08:22:38 -0500 Subject: STORM-2082 Change menu text --- 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 d737df3941..448d3f2ebe 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1533,7 +1533,7 @@ parameter="scene_load_stats" /> Date: Wed, 25 Feb 2015 09:28:16 -0500 Subject: STORM-2082 Add tool tip for Complexity slider --- .../skins/default/xui/en/floater_preferences_graphics_advanced.xml | 1 + 1 file changed, 1 insertion(+) (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 25576fe643..766adb8a34 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 @@ -118,6 +118,7 @@ Date: Wed, 25 Feb 2015 19:30:23 +0100 Subject: Updated Polish translation up to 3.7.26 Waiting for the revert of commit c924d3adeead --- indra/newview/skins/default/xui/pl/notifications.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index f72dd69fed..a19463beee 100755 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -3569,9 +3569,11 @@ Spróbuj ponownie za minutę. Zostałeś/aś teleportowany/a przez dodatek na [ITEM_ID] + Zostałeś/aś teleportowany/a przez obiekt '[OBJECT_NAME]' na działce '[PARCEL_NAME]' + Zostałeś/aś teleportowany/a przez obiekt '[OBJECT_NAME]' należący do [OWNER_ID] -- cgit v1.2.3 From 6380ff6513f0db197e00bc340926666dfaedf1d0 Mon Sep 17 00:00:00 2001 From: Northspring Date: Sun, 15 Mar 2015 14:32:38 +0100 Subject: Polish translation: Some dynamically assigned strings in snapshot floater are too long --- indra/newview/skins/default/xui/pl/floater_snapshot.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml index fe1c493c16..540aa4686e 100755 --- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml @@ -31,22 +31,22 @@ Zapisano do Szafy! - Zapisano na komputerze! + Zapisano na dysku! - Publikacja obrazu na osi czasu nie powiodła się. + Publikacja nie powiodła się. - Publikacja obrazu na kanale nie powiodła się. + Publikacja nie powiodła się. - Wysyłanie maila nie powiodło się. + Wysyłanie maila nieudane. - Zapis do Szafy nie powiódł się. + Zapis do Szafy nieudany. - Zapis na komputerze nie powiódł się. + Zapis na dysku nieudany.