diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-01-19 00:24:25 +0200 |
---|---|---|
committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-01-24 17:39:28 +0200 |
commit | dd09848d4b99a38f74485a75b333725e4956a640 (patch) | |
tree | 13664b9b5691d20dc75c0abbe60105a3e91e5315 /indra/newview/skins/default/xui/en | |
parent | da48bd943923958952ea77eed858ba8372d58d9a (diff) |
Fix profile's pick hiding wrong panel
And cleanup after a contribution
Diffstat (limited to 'indra/newview/skins/default/xui/en')
13 files changed, 27 insertions, 35 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 8641c43d66..508aba6ae1 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -290,7 +290,7 @@ image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" - name="info_btn1" + name="info_btn" top_delta="-2" width="16" /> <button diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index bfe1f7fc3a..6248829500 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -157,7 +157,7 @@ font="SansSerif" left="0" top_pad="7" - name="label_objects1" + name="label_direction" text_color="White" type="string"> Show direction to: diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml index be43283a52..a73af968af 100644 --- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml @@ -119,7 +119,7 @@ tick_spacing="100" show_history="true" show_bar="false"/> - <stat_bar name="texture_decode_latency1" + <stat_bar name="texture_write_latency" label="Cache Write Latency" orientation="horizontal" unit_label="sec" diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml index ab1a241025..22dbd80cda 100644 --- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml @@ -161,7 +161,7 @@ layout="topleft" left="185" length="1" - name="google_links_text" + name="azure_links_text" top_pad="-262" type="string" width="100"> @@ -302,7 +302,7 @@ layout="topleft" left="185" length="1" - name="google_links_text1" + name="google_links_text" top_delta="-23" type="string" width="100"> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index d13ab35d6d..7efa81d263 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -241,7 +241,7 @@ image_name="legend.tga" layout="topleft" mouse_opaque="true" - name="square2" + name="square2_auction" left="20" top_pad="2" width="16" /> @@ -264,7 +264,7 @@ image_name="legend.tga" layout="topleft" mouse_opaque="true" - name="square21" + name="square2_owner" left="20" top_pad="-5" width="16" /> diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index 0f06b239b5..238c7d380b 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -496,7 +496,7 @@ media_plugin_libvlc </impl> </mimetype> - <mimetype name="application/octet-stream1"> + <mimetype name="application/octet-stream"> <label name="video/octet-stream"> Movie </label> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1703e17060..3ca284b0fa 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6474,14 +6474,6 @@ Your inventory is experiencing issues. Please, contact support. </notification> <notification - icon="notifytip.tga" - name="InventoryLimitReachedAIS1" - type="notifytip"> -Your inventory is experiencing issues. Please, contact support. - <tag>fail</tag> - </notification> - - <notification icon="alertmodal.tga" name="ConfirmClearBrowserCache" type="alertmodal"> diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml index 5dc84fd83f..7ba7b1d579 100644 --- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml +++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml @@ -156,7 +156,7 @@ layout="topleft" left_pad="10" top_delta="1" - name="quality_lbl1" + name="best_quality_lbl" width="70"> Best quality </text> @@ -416,7 +416,7 @@ layout="topleft" top_delta="3" left_pad="10" - name="photo_desc1" + name="photo_dist_det_desc" width="180"> (Enter value between 0.0 and 4.0) </text> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index bcf79b083f..8051ffa8ec 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -166,7 +166,7 @@ left_pad="0" max_val="2.0" min_val="1.0" - name="ui_scale_slider1" + name="hud_scale_slider" top_pad="-14" width="250" /> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index c2b2404a95..7eaaaee536 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -107,7 +107,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio1" + name="mute_audio_ui" tab_stop="false" width="16" /> <slider @@ -141,7 +141,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio2" + name="mute_audio_ambient" tab_stop="false" width="16" /> <slider @@ -175,7 +175,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio3" + name="mute_audio_sounds" tab_stop="false" width="16"> <button.commit_callback @@ -212,7 +212,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio4" + name="mute_audio_music" tab_stop="false" width="16" /> <check_box @@ -258,7 +258,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio5" + name="mute_audio_media" tab_stop="false" width="16" /> <check_box @@ -306,7 +306,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio6" + name="mute_audio_voice" tab_stop="false" width="16" /> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml index 7a30a82ed6..024120931f 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml @@ -138,11 +138,11 @@ <layout_panel follows="all" layout="bottomleft" - name="save_changes_lp" + name="util_buttons_lp" auto_resize="false" height="25"> <layout_stack - name="save_changes_stack" + name="util_buttons_stack" left="1" right="-1" top="0" @@ -212,7 +212,7 @@ <layout_panel follows="all" layout="bottomleft" - name="save_changes_lp1" + name="save_changes_lp" auto_resize="false" height="41"> <view_border diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml index 5f4562e02d..75e76f599b 100644 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -74,7 +74,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio1" + name="mute_audio_ui" tab_stop="false" width="16" /> <slider @@ -107,7 +107,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio2" + name="mute_audio_ambient" tab_stop="false" width="16" /> <slider @@ -140,7 +140,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio3" + name="mute_audio_sounds" tab_stop="false" width="16"> <button.commit_callback @@ -186,7 +186,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio4" + name="mute_audio_music" tab_stop="false" width="16" /> <check_box @@ -232,7 +232,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio5" + name="mute_audio_media" tab_stop="false" width="16" /> <check_box @@ -280,7 +280,7 @@ is_toggle="true" layout="topleft" left_pad="5" - name="mute_audio6" + name="mute_audio_voice" tab_stop="false" width="16" /> <check_box diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index d5261126cf..bdb4b545c1 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -288,7 +288,7 @@ TestString PleaseIgnore height="15" follows="left|top" layout="topleft" - name="perm_modify1" + name="you_perm_modify" width="200"> You can: </text> |