summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/en/floater_adjust_environment.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml20
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml82
-rw-r--r--indra/newview/skins/default/xui/en/menu_gallery_inventory.xml228
-rw-r--r--indra/newview/skins/default/xui/en/menu_nearby_media.xml25
-rw-r--r--indra/newview/skins/default/xui/en/menu_object.xml48
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml90
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml70
-rw-r--r--indra/newview/skins/default/xui/en/panel_performance_nearby.xml41
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml64
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml260
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_terrain_elevation.xml307
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml421
-rw-r--r--indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml18
-rw-r--r--indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml7
-rw-r--r--indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_grids.xml21
-rw-r--r--indra/newview/skins/default/xui/pl/floater_outfit_photo_preview.xml13
-rw-r--r--indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml6
-rw-r--r--indra/newview/skins/default/xui/pl/floater_texture_fetch_debugger.xml73
-rw-r--r--indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml77
-rw-r--r--indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml77
29 files changed, 1600 insertions, 893 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 97b0364832..0000000000
--- a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="Debugger für Texturabruffehler">
- <text name="total_num_fetched_label">
- 1, Gesamtzahl abgerufener Texturen: [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, Gesamtzahl von Abrufanforderungen: [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, Gesamtzahl von Cachetreffern: [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, Gesamtzahl sichtbarer Texturen: [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, Gesamtzahl von Abrufanforderungen für sichtbare Texturen: [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, Gesamtmenge abgerufener Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <text name="total_fetched_vis_data_label">
- 7, Gesamtmenge sichtbarer Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, Gesamtmenge dargestellter Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <text name="total_time_cache_read_label">
- 9, Gesamtzeit Cache-Lesezugriffe: [TIME] s
- </text>
- <text name="total_time_cache_write_label">
- 10, Gesamtzeit Cache-Schreibzugriffe: [TIME] s
- </text>
- <text name="total_time_decode_label">
- 11, Gesamtzeit Decodierung: [TIME] s
- </text>
- <text name="total_time_gl_label">
- 12, Gesamtzeit GL-Texturerstellung: [TIME] s
- </text>
- <text name="total_time_http_label">
- 13, Gesamtzeit HTTP-Abrufe: [TIME] s
- </text>
- <text name="total_time_fetch_label">
- 14, Gesamtzeit für alle Abrufe: [TIME] s
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, Neuabruf sichtbarer Texturen aus Cache, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, Neuabruf aller Texturen aus Cache, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, Neuabruf sichtbarer Texturen von HTTP, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, Neuabruf aller Texturen von HTTP, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <spinner label="19, Verhältnis Texel/Pixel:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20, Texturquelle:
- </text>
- <radio_group name="texture_source">
- <radio_item label="Cache + HTTP" name="0"/>
- <radio_item label="Nur HTTP" name="1"/>
- </radio_group>
- <button label="Starten" name="start_btn"/>
- <button label="Zurücksetzen" name="clear_btn"/>
- <button label="Schließen" name="close_btn"/>
- <button label="Cache-Lesezugriff" name="cacheread_btn"/>
- <button label="Cache-Schreibzugriff" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="Decodieren" name="decode_btn"/>
- <button label="GL-Textur" name="gl_btn"/>
- <button label="Neuabruf sichtbarer Texturen (Cache)" name="refetchviscache_btn"/>
- <button label="Neuabruf des gesamten Cache" name="refetchallcache_btn"/>
- <button label="Neuabruf sichtbarer Texturen (HTTP)" name="refetchvishttp_btn"/>
- <button label="Neuabruf des gesamten HTTP" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index 91a1dffcb5..889eeb5369 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -12,7 +12,7 @@
can_resize="false">
<string name="hdr_string">HDR Scale:</string>
<string name="brightness_string">Brightness:</string>
- <string name="hdr_tooltip">Intensity of lightning effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
+ <string name="hdr_tooltip">Intensity of lighting effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
<layout_stack name="outer_stack"
width="845"
height="275"
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 223069ed0c..465580301e 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -9,6 +9,10 @@
width="319">
<floater.string
+ name="multiple_item_names">
+ Multiple items selected
+ </floater.string>
+ <floater.string
name="title_item_thumbnail">
CHANGE ITEM IMAGE
</floater.string>
@@ -72,6 +76,22 @@
height="256"
width="256"
/>
+ <text
+ name="multiple_lbl"
+ font="SansSerifBig"
+ text_color="White"
+ halign="center"
+ valign="center"
+ use_ellipses="true"
+ follows="top|left"
+ layout="topleft"
+ height="256"
+ width="256"
+ top_delta="0"
+ left_delta="0"
+ visible =" false">
+ Multiple thumbnails
+ </text>
<button
follows="right|bottom"
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 94c889f4e4..7bc81a1f79 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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- height="400"
+ height="411"
layout="topleft"
name="prefs_graphics_advanced"
help_topic="Preferences_Graphics_Advanced"
@@ -102,6 +102,22 @@
width="65">
Low
</text>
+ <slider
+ control_name="RenderLocalLightCount"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="256"
+ label="Max. nearby lights:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ min_val="0"
+ max_val="8192"
+ name="MaxLights"
+ top_delta="16"
+ width="336" />
<check_box
control_name="RenderVSyncEnable"
@@ -128,6 +144,42 @@
Avatar
</text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="30"
+ top_delta="16"
+ width="128"
+ name="AvatarComplexityModeLabel"
+ text_readonly_color="LabelDisabledColor">
+ Avatar display:
+ </text>
+
+ <combo_box
+ control_name="RenderAvatarComplexityMode"
+ height="18"
+ layout="topleft"
+ left_delta="130"
+ top_delta="0"
+ name="AvatarComplexityMode"
+ width="150">
+ <combo_box.item
+ label="Limit by complexity"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="Always show friends"
+ name="1"
+ value="1"/>
+ <combo_box.item
+ label="Only show friends"
+ name="2"
+ value="2"/>
+ </combo_box>
+
<slider
control_name="IndirectMaxComplexity"
tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
@@ -493,7 +545,7 @@
</text>
<view_border
bevel_style="in"
- height="322"
+ height="357"
layout="topleft"
left="385"
name="vert_border"
@@ -812,21 +864,21 @@
name="HeroProbeUpdateRate"
width="150">
<combo_box.item
- label="Every Frame"
- name="0"
- value="1"/>
+ label="Low"
+ name="6"
+ value="6"/>
<combo_box.item
- label="Every 2nd Frame"
+ label="Medium"
+ name="3"
+ value="3"/>
+ <combo_box.item
+ label="High"
name="1"
value="2"/>
<combo_box.item
- label="Every 3rd Frame"
- name="2"
- value="3"/>
- <combo_box.item
- label="Every 4th Frame"
- name="3"
- value="4"/>
+ label="Ultra"
+ name="0"
+ value="1"/>
</combo_box>
<!-- End of mirror settings -->
@@ -837,7 +889,7 @@
layout="topleft"
left="13"
name="horiz_border"
- top="338"
+ top="373"
top_delta="5"
width="774"/>
<button
@@ -847,7 +899,7 @@
layout="topleft"
left="20"
name="Defaults"
- top_delta="20"
+ top_delta="7"
width="210">
<button.commit_callback
function="Pref.HardwareDefaults" />
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index c11f1c88cb..16907d3577 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -426,6 +426,234 @@
<menu_item_separator
layout="topleft"
name="Subfolder Separator" />
+ <menu
+ label="Create new"
+ layout="topleft"
+ name="create_new">
+ <menu_item_call
+ label="New Folder"
+ layout="topleft"
+ name="New Folder">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="category" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Script"
+ layout="topleft"
+ name="New Script">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="lsl" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Notecard"
+ layout="topleft"
+ name="New Note">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="notecard" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Gesture"
+ layout="topleft"
+ name="New Gesture">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="gesture" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Material"
+ layout="topleft"
+ name="New Material">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="material" />
+ <menu_item_call.on_enable
+ function="Inventory.MaterialsEnabled" />
+ </menu_item_call>
+ <menu
+ label="New Clothes"
+ layout="topleft"
+ name="New Clothes">
+ <menu_item_call
+ label="New Shirt"
+ layout="topleft"
+ name="New Shirt">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="shirt" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Pants"
+ layout="topleft"
+ name="New Pants">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="pants" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Shoes"
+ layout="topleft"
+ name="New Shoes">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="shoes" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Socks"
+ layout="topleft"
+ name="New Socks">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="socks" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Jacket"
+ layout="topleft"
+ name="New Jacket">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="jacket" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Skirt"
+ layout="topleft"
+ name="New Skirt">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="skirt" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Gloves"
+ layout="topleft"
+ name="New Gloves">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="gloves" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Undershirt"
+ layout="topleft"
+ name="New Undershirt">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="undershirt" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Underpants"
+ layout="topleft"
+ name="New Underpants">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="underpants" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Alpha Mask"
+ layout="topleft"
+ name="New Alpha Mask">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="alpha" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Tattoo"
+ layout="topleft"
+ name="New Tattoo">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="tattoo" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Universal"
+ layout="topleft"
+ name="New Universal">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="universal" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Physics"
+ layout="topleft"
+ name="New Physics">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="physics" />
+ </menu_item_call>
+ </menu>
+ <menu
+ label="New Body Parts"
+ layout="topleft"
+ name="New Body Parts">
+ <menu_item_call
+ label="New Shape"
+ layout="topleft"
+ name="New Shape">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="shape" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Skin"
+ layout="topleft"
+ name="New Skin">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="skin" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Hair"
+ layout="topleft"
+ name="New Hair">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="hair" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Eyes"
+ layout="topleft"
+ name="New Eyes">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="eyes" />
+ </menu_item_call>
+ </menu>
+ <menu
+ label="New Settings"
+ layout="topleft"
+ name="New Settings">
+ <menu_item_call
+ label="New Sky"
+ layout="topleft"
+ name="New Sky">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="sky"/>
+ <menu_item_call.on_enable
+ function="Inventory.EnvironmentEnabled" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Water"
+ layout="topleft"
+ name="New Water">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="water"/>
+ <menu_item_call.on_enable
+ function="Inventory.EnvironmentEnabled" />
+ </menu_item_call>
+ <menu_item_call
+ label="New Day Cycle"
+ layout="topleft"
+ name="New Day Cycle">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="daycycle"/>
+ <menu_item_call.on_enable
+ function="Inventory.EnvironmentEnabled" />
+ </menu_item_call>
+ </menu>
+ </menu>
<menu_item_call
label="Create folder from selected"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_media.xml b/indra/newview/skins/default/xui/en/menu_nearby_media.xml
new file mode 100644
index 0000000000..7c91241a19
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_nearby_media.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ name="menu_nearby_media"
+ left="0"
+ bottom="0"
+ visible="false"
+ mouse_opaque="false">
+ <menu_item_call
+ label="Copy Url"
+ name="copy_url">
+ <menu_item_call.on_click
+ function="SelectedMediaCtrl.Action"
+ parameter="copy_url" />
+ </menu_item_call>
+ <menu_item_call
+ label="Copy Data"
+ name="copy_data">
+ <menu_item_call.on_click
+ function="SelectedMediaCtrl.Action"
+ parameter="copy_data" />
+ <menu_item_call.on_visible
+ function="SelectedMediaCtrl.Visible"
+ parameter="copy_data" />
+ </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index cbd38b1db8..2df581fa2c 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -173,6 +173,8 @@
function="Object.Take"/>
<menu_item_call.on_enable
function="Object.VisibleTake"/>
+ <menu_item_call.on_visible
+ function="Object.VisibleTakeSingle"/>
</menu_item_call>
<menu_item_call
enabled="false"
@@ -182,6 +184,52 @@
function="Tools.TakeCopy" />
<menu_item_call.on_enable
function="Tools.EnableTakeCopy" />
+ <menu_item_call.on_visible
+ function="Object.VisibleTakeSingle"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Take as combined item"
+ layout="topleft"
+ name="Take combined">
+ <menu_item_call.on_click
+ function="Object.Take"/>
+ <menu_item_call.on_enable
+ function="Object.VisibleTake"/>
+ <menu_item_call.on_visible
+ function="Object.VisibleTakeMultiple"/>
+ </menu_item_call>
+ <menu_item_call
+ enabled="false"
+ label="Take copy as combined item"
+ name="Take Copy combined">
+ <menu_item_call.on_click
+ function="Tools.TakeCopy" />
+ <menu_item_call.on_enable
+ function="Tools.EnableTakeCopy" />
+ <menu_item_call.on_visible
+ function="Object.VisibleTakeMultiple"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Take as separate items"
+ layout="topleft"
+ name="Take Separate">
+ <menu_item_call.on_click
+ function="Object.TakeSeparate"/>
+ <menu_item_call.on_enable
+ function="Object.EnableTakeMultiple"/>
+ <menu_item_call.on_visible
+ function="Object.VisibleTakeMultiple"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Take copies as separate items"
+ layout="topleft"
+ name="Take Copy Separate">
+ <menu_item_call.on_click
+ function="Object.TakeSeparateCopy"/>
+ <menu_item_call.on_enable
+ function="Tools.EnableCopySeparate"/>
+ <menu_item_call.on_visible
+ function="Object.VisibleTakeMultiple"/>
</menu_item_call>
<menu_item_call
enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d17aec0f6a..d5d2d00630 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2822,6 +2822,70 @@ function="World.EnvPreset"
parameter="mem_leaking" />
</menu_item_call>
</menu>
+ <menu
+ create_jump_keys="true"
+ label="GLTF"
+ name="GLTF"
+ tear_off="true">
+ <menu_item_call
+ label="Open..."
+ name="Open...">
+ <!--<menu_item_call.on_enable
+ function="EnableGLTF"/>-->
+ <menu_item_call.on_click
+ function="Advanced.ClickGLTFOpen" />
+ </menu_item_call>
+ <menu_item_call
+ label="Save As..."
+ name="Save As...">
+ <menu_item_call.on_enable
+ function="EnableGLTFSaveAs"/>
+ <menu_item_call.on_click
+ function="Advanced.ClickGLTFSaveAs" />
+ </menu_item_call>
+ <menu_item_call
+ label="Upload..."
+ name="Upload...">
+ <menu_item_call.on_enable
+ function="EnableGLTFUpload"/>
+ <menu_item_call.on_click
+ function="Advanced.ClickGLTFUpload" />
+ </menu_item_call>
+ </menu>
+ <menu
+ create_jump_keys="true"
+ label="Video"
+ name="Video"
+ tear_off="true">
+ <menu_item_call
+ label="1080x1920"
+ name="1080x1920">
+ <menu_item_call.on_click
+ function="Advanced.ClickResizeWindow"
+ parameter="1080x1920"/>
+ </menu_item_call>
+ <menu_item_call
+ label="1920x1080"
+ name="1920x1080">
+ <menu_item_call.on_click
+ function="Advanced.ClickResizeWindow"
+ parameter="1920x1080"/>
+ </menu_item_call>
+ <menu_item_call
+ label="1280x720"
+ name="1280x720">
+ <menu_item_call.on_click
+ function="Advanced.ClickResizeWindow"
+ parameter="1280x720"/>
+ </menu_item_call>
+ <menu_item_call
+ label="720x1280"
+ name="720x1280">
+ <menu_item_call.on_click
+ function="Advanced.ClickResizeWindow"
+ parameter="720x1280"/>
+ </menu_item_call>
+ </menu>
<menu
create_jump_keys="true"
label="Render Tests"
@@ -2874,12 +2938,6 @@ function="World.EnvPreset"
<menu_item_call.on_click
function="Advanced.ClickHDRIPreview" />
</menu_item_call>
- <menu_item_call
- label="GLTF Scene Preview"
- name="GLTF Scene Preview">
- <menu_item_call.on_click
- function="Advanced.ClickGLTFScenePreview" />
- </menu_item_call>
</menu>
<menu
create_jump_keys="true"
@@ -3900,6 +3958,16 @@ function="World.EnvPreset"
function="ToggleControl"
parameter="AllowSelectAvatar" />
</menu_item_check>
+ <menu_item_check
+ label="Render Only Friends"
+ name="Render Only Friends">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="RenderAvatarFriendsOnly" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="RenderAvatarFriendsOnly" />
+ </menu_item_check>
</menu>
<menu
create_jump_keys="true"
@@ -3997,6 +4065,16 @@ function="World.EnvPreset"
function="Advanced.ToggleDebugCharacterVis" />
</menu_item_check>
<menu_item_check
+ label="Debug Character Rez State"
+ name="Debug Character Rez State">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="NameTagDebugAVRezState" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="NameTagDebugAVRezState" />
+ </menu_item_check>
+ <menu_item_check
label="Show Collision Skeleton"
name="Show Collision Skeleton">
<menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e9a67fb707..1e2cb9566d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6267,7 +6267,7 @@ Are you sure you want to delete them?
notext="Cancel"
yestext="OK"/>
</notification>
-
+
<notification
icon="alertmodal.tga"
name="DeleteWornItems"
@@ -6342,6 +6342,17 @@ You must replace those layers before deleting them.
yestext="OK"/>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="ThumbnailSelectionTooLarge"
+ type="alertmodal">
+ <unique/>
+ You can only modify up to 50 thumbnails at a time.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
<notification
icon="alertmodal.tga"
name="ConfirmUnlink"
@@ -12465,7 +12476,7 @@ are wearing now.
<notification
icon="alertmodal.tga"
- name="GLTFPreviewSelection"
+ name="GLTFOpenSelection"
type="alert">
You must select an object to act as a handle to the GLTF asset you are previewing.
<tag>fail</tag>
@@ -12474,4 +12485,59 @@ are wearing now.
yestext="OK"/>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="GLTFLoadFailed"
+ type="alert">
+ Failed to load GLTF file. See log for details.
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="GLTFSaveFailed"
+ type="alert">
+ Failed to save GLTF file. See log for details.
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="GLTFSaveSelection"
+ type="alert">
+ You must select an object that has a GLTF asset associated with it.
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="GLTFUploadSelection"
+ type="alert">
+ You must select an object that has local-only GLTF asset associated with it.
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="GLTFUploadInProgress"
+ type="alert">
+ Upload is currently in progress. Please try again later.
+ <tag>fail</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
</notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
index ca961747c4..4409feb23a 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -135,18 +135,41 @@
name="exceptions_btn"
width="100">
</button>
- <check_box
- control_name="AlwaysRenderFriends"
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
height="16"
- initial_value="true"
- label="Always display friends in full detail"
- label_text.text_color="White"
layout="topleft"
- name="display_friends"
- top_pad="3"
left="18"
- width="256">
- </check_box>
+ top_pad="3"
+ name="AvatarComplexityModeLabel"
+ text_readonly_color="LabelDisabledColor"
+ width="128">
+ Avatar display:
+ </text>
+ <combo_box
+ control_name="RenderAvatarComplexityMode"
+ height="23"
+ layout="topleft"
+ left_delta="130"
+ top_delta="-4"
+ name="AvatarComplexityMode"
+ width="150">
+ <combo_box.item
+ label="Limit by complexity"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="Always show friends"
+ name="1"
+ value="1"/>
+ <combo_box.item
+ label="Only show friends"
+ name="2"
+ value="2"/>
+ </combo_box>
<view_border
bevel_style="in"
height="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 adc0337edd..5d347397bf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -242,6 +242,41 @@
<button.commit_callback
function="Pref.AutoAdjustments"/>
</button>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="30"
+ top_delta="42"
+ width="128"
+ name="AvatarComplexityModeLabel"
+ text_readonly_color="LabelDisabledColor">
+ Avatar display:
+ </text>
+ <combo_box
+ control_name="RenderAvatarComplexityMode"
+ height="23"
+ layout="topleft"
+ left_delta="130"
+ top_delta="-4"
+ name="AvatarComplexityMode"
+ width="150">
+ <combo_box.item
+ label="Limit by complexity"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="Always show friends"
+ name="1"
+ value="1"/>
+ <combo_box.item
+ label="Only show friends"
+ name="2"
+ value="2"/>
+ </combo_box>
<slider
control_name="IndirectMaxComplexity"
@@ -250,7 +285,7 @@
height="16"
initial_value="101"
increment="1"
- label="Avatar Maximum Complexity:"
+ label="Avatar maximum complexity:"
label_width="165"
layout="topleft"
left="30"
@@ -258,7 +293,7 @@
max_val="101"
name="IndirectMaxComplexity"
show_text="false"
- top_delta="40"
+ top_delta="28"
width="300">
<slider.commit_callback
function="Pref.UpdateIndirectMaxComplexity"
@@ -277,32 +312,7 @@
width="65">
0
</text>
-<text
-type="string"
-length="1"
-follows="left|top"
-height="16"
-layout="topleft"
-left_delta="68"
-name="IndirectMaxComplexityLink"
-mouse_opaque="false"
-top_delta="0"
-width="120">
-[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 What's this?]
-</text>
-
- <check_box
- control_name="AlwaysRenderFriends"
- height="16"
- initial_value="true"
- label="Always Render Friends"
- layout="topleft"
- left="30"
- name="AlwaysRenderFriends"
- top_delta="24"
- width="256">
- </check_box>
<button
height="23"
label="Exceptions..."
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml b/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml
new file mode 100644
index 0000000000..9a90700056
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+ border="true"
+ follows="top|left"
+ height="460"
+ label="Terrain"
+ layout="topleft"
+ left="0"
+ name="Terrain"
+ top="320"
+ width="480">
+ <text
+ follows="left|top"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="region_text_lbl"
+ top="10"
+ width="100">
+ Region:
+ </text>
+ <text
+ follows="left|top"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left_delta="50"
+ name="region_text"
+ top_delta="0"
+ width="400">
+ unknown
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="detail_texture_text"
+ left="10"
+ top="35"
+ width="170">
+ Terrain Textures
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="detail_material_text"
+ left="10"
+ top="35"
+ width="170">
+ Terrain Materials
+ </text>
+ <check_box
+ height="20"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ layout="topleft"
+ top_delta="1"
+ left_delta="180"
+ label="PBR Metallic Roughness"
+ name="terrain_material_type"
+ tool_tip="If checked, use PBR Metallic Roughness materials for terrain. Otherwise, use textures."
+ left_pad="2"
+ width="200" />
+ <texture_picker
+ follows="left|top"
+ height="121"
+ layout="topleft"
+ left="10"
+ name="texture_detail_0"
+ default_image_id="0bc58228-74a0-7e83-89bc-5c23464bcec5"
+ top_delta="30"
+ width="100" />
+ <texture_picker
+ follows="top"
+ height="121"
+ layout="topleft"
+ left_pad="10"
+ name="texture_detail_1"
+ default_image_id="63338ede-0037-c4fd-855b-015d77112fc8"
+ top_delta="0"
+ width="100" />
+ <texture_picker
+ follows="left|top"
+ height="121"
+ layout="topleft"
+ left_pad="10"
+ name="texture_detail_2"
+ default_image_id="303cd381-8560-7579-23f1-f0a880799740"
+ top_delta="0"
+ width="100" />
+ <texture_picker
+ follows="left|top"
+ height="121"
+ layout="topleft"
+ left_pad="10"
+ name="texture_detail_3"
+ default_image_id="53a2f406-4895-1d13-d541-d2e3b86bc19c"
+ top_delta="0"
+ width="100" />
+ <texture_picker
+ visible="false"
+ follows="left|top"
+ height="121"
+ layout="topleft"
+ left="10"
+ name="material_detail_0"
+ pick_type="material"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+ top_delta="0"
+ width="100" />
+ <texture_picker
+ visible="false"
+ follows="left|top"
+ height="121"
+ layout="topleft"
+ left_pad="10"
+ name="material_detail_1"
+ pick_type="material"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+ top_delta="0"
+ width="100" />
+ <texture_picker
+ visible="false"
+ follows="left|top"
+ height="121"
+ layout="topleft"
+ left_pad="10"
+ name="material_detail_2"
+ pick_type="material"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+ top_delta="0"
+ width="100" />
+ <texture_picker
+ visible="false"
+ follows="left|top"
+ height="121"
+ layout="topleft"
+ left_pad="10"
+ name="material_detail_3"
+ pick_type="material"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+ top_delta="0"
+ width="100" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="height_text_lbl"
+ top_delta="104"
+ width="65">
+ 1 (Low)
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left_pad="45"
+ name="height_text_lbl2"
+ top_delta="0"
+ width="100">
+ 2
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left_pad="10"
+ name="height_text_lbl3"
+ top_delta="0"
+ width="100">
+ 3
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left_pad="10"
+ name="height_text_lbl4"
+ top_delta="0"
+ width="100">
+ 4 (High)
+ </text>
+ <layout_stack name="terrain_features_stack"
+ width="477"
+ height="230"
+ follows="all"
+ animate="false"
+ left="0"
+ top_delta="22"
+ orientation="vertical">
+ <layout_panel name="frame_settings_terrain"
+ auto_resize="true"
+ user_resize="false"
+ height="230"
+ width="467"
+ min_height="0"
+ visible="true">
+ <tab_container
+ follows="all"
+ halign="left"
+ height="230"
+ visible="true"
+ layout="topleft"
+ left="0"
+ name="terrain_tabs"
+ tab_position="top"
+ tab_width="110"
+ tab_padding_right="3"
+ top_pad="0"
+ width="700">
+ <panel
+ border="true"
+ filename="panel_settings_terrain_elevation.xml"
+ label="Elevation"
+ layout="topleft"
+ left_delta="0"
+ top_pad="5"
+ name="terrain_elevation_panel" />
+ <panel
+ border="true"
+ filename="panel_settings_terrain_transform.xml"
+ label="Transforms"
+ layout="topleft"
+ left_delta="0"
+ top_pad="5"
+ name="terrain_transform_panel" />
+ </tab_container>
+ </layout_panel>
+ </layout_stack>
+ <button
+ enabled="true"
+ follows="left|top"
+ height="20"
+ label="Apply"
+ layout="topleft"
+ left="351"
+ name="apply_btn"
+ top_delta="310"
+ width="100" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 59ee0c6ad5..a29cdb5b41 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -9,7 +9,7 @@
top="0">
<string name="hdr_string">HDR Scale:</string>
<string name="brightness_string">Brightness:</string>
- <string name="hdr_tooltip">Intensity of lightning effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
+ <string name="hdr_tooltip">Intensity of lighting effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
<layout_stack
name="main_ls"
follows="all"
@@ -318,7 +318,7 @@
layout="topleft"
left_delta="-5"
top_delta="25"
- tooltip="Irradiance control. When not zero, enables HDR lighting model."
+ tool_tip="Irradiance control. When not zero, enables HDR lighting model."
width="200">
Reflection Probe Ambiance (HDR):
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_terrain_elevation.xml b/indra/newview/skins/default/xui/en/panel_settings_terrain_elevation.xml
new file mode 100644
index 0000000000..89443290ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_terrain_elevation.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+ border="true"
+ follows="all"
+ label="Elevation"
+ layout="topleft"
+ left="0"
+ name="panel_settings_terrain_elevation"
+ top="0">
+ <spinner
+ follows="left|top"
+ height="20"
+ label="Water Height"
+ label_width="120"
+ layout="topleft"
+ left="15"
+ max_val="100"
+ name="water_height_spin"
+ top_delta="18"
+ width="180" />
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.2"
+ label="Terrain Raise Limit"
+ label_width="120"
+ layout="topleft"
+ left="240"
+ max_val="100"
+ name="terrain_raise_spin"
+ top_delta="0"
+ width="180" />
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.2"
+ label="Terrain Lower Limit"
+ label_width="120"
+ layout="topleft"
+ left="240"
+ max_val="0"
+ min_val="-100"
+ name="terrain_lower_spin"
+ top_delta="20"
+ width="180" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="60"
+ layout="topleft"
+ left="8"
+ top_delta="-30"
+ width="460" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="height_text_lbl5"
+ top_delta="74"
+ width="300">
+ Texture Elevation Ranges
+ </text>
+ <text
+ visible="false"
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="height_text_lbl5_material"
+ top_delta="0"
+ width="300">
+ Material Elevation Ranges
+ </text>
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="height_text_lbl10"
+ top_delta="30"
+ width="200"
+ word_wrap="true">
+ These values represent the blend range for the textures above.
+ </text>
+ <text
+ visible="false"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="height_text_lbl10_material"
+ top_delta="0"
+ width="200"
+ word_wrap="true">
+ These values represent the blend range for the materials above.
+ </text>
+ <text
+ follows="left|top"
+ height="60"
+ layout="topleft"
+ left_delta="0"
+ name="height_text_lbl11"
+ top_delta="32"
+ width="200"
+ word_wrap="true">
+ Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
+ </text>
+ <text
+ visible="false"
+ follows="left|top"
+ height="60"
+ layout="topleft"
+ left_delta="0"
+ name="height_text_lbl11_material"
+ top_delta="0"
+ width="200"
+ word_wrap="true">
+ Measured in meters, the LOW value is the MAXIMUM height of Material #1, and the HIGH value is the MINIMUM height of Material #4.
+ </text>
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="270"
+ name="height_text_lbl6"
+ top_delta="-62"
+ width="100">
+ Northwest
+ </text>
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left_pad="10"
+ name="height_text_lbl7"
+ top_delta="0"
+ width="100">
+ Northeast
+ </text>
+<!-- northwest low-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="Low"
+ label_width="37"
+ layout="topleft"
+ left="230"
+ max_val="500"
+ min_val="-500"
+ name="height_start_spin_1"
+ top_delta="15"
+ width="100" />
+<!-- northeast low-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="Low"
+ label_width="37"
+ layout="topleft"
+ left_pad="10"
+ max_val="500"
+ min_val="-500"
+ name="height_start_spin_3"
+ top_delta="0"
+ width="100" />
+<!-- northwest high-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="High"
+ label_width="37"
+ layout="topleft"
+ left="230"
+ max_val="500"
+ min_val="-500"
+ name="height_range_spin_1"
+ top_delta="20"
+ width="100" />
+<!-- northeast high-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="High"
+ label_width="37"
+ layout="topleft"
+ left_pad="10"
+ max_val="500"
+ min_val="-500"
+ name="height_range_spin_3"
+ top_delta="0"
+ width="100" />
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="270"
+ name="height_text_lbl8"
+ top_pad="10"
+ width="100">
+ Southwest
+ </text>
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left_pad="10"
+ name="height_text_lbl9"
+ top_delta="0"
+ width="100">
+ Southeast
+ </text>
+<!-- southwest low-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="Low"
+ label_width="37"
+ layout="topleft"
+ left="230"
+ max_val="500"
+ min_val="-500"
+ name="height_start_spin_0"
+ top_delta="15"
+ width="100" />
+<!-- southeast low-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="Low"
+ label_width="37"
+ layout="topleft"
+ left_pad="10"
+ max_val="500"
+ min_val="-500"
+ name="height_start_spin_2"
+ top_delta="0"
+ width="100" />
+<!--southwest high-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="High"
+ label_width="37"
+ layout="topleft"
+ left="230"
+ max_val="500"
+ min_val="-500"
+ name="height_range_spin_0"
+ top_delta="20"
+ width="100" />
+<!-- southeast high-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="High"
+ label_width="37"
+ layout="topleft"
+ left_pad="10"
+ max_val="500"
+ min_val="-500"
+ name="height_range_spin_2"
+ top_delta="0"
+ width="100" />
+<!-- Terrain Download/Upload/Bake buttons -->
+ <button
+ follows="left|top"
+ height="20"
+ label="Download RAW terrain..."
+ layout="topleft"
+ left="10"
+ name="download_raw_btn"
+ tool_tip="Available only to estate owners, not managers"
+ top_delta="40"
+ width="160" />
+ <button
+ follows="left|top"
+ height="20"
+ label="Upload RAW terrain..."
+ layout="topleft"
+ left_pad="10"
+ top_delta="0"
+ name="upload_raw_btn"
+ tool_tip="Available only to estate owners, not managers"
+ width="160" />
+ <button
+ follows="left|top"
+ height="20"
+ label="Bake Terrain"
+ layout="topleft"
+ left_pad="10"
+ name="bake_terrain_btn"
+ tool_tip="Set current terrain as mid-point for raise/lower limits"
+ width="100" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
new file mode 100644
index 0000000000..0bf0d8cffc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+ border="true"
+ follows="all"
+ label="Samping"
+ layout="topleft"
+ left="0"
+ name="panel_settings_terrain_transform"
+ top="0">
+ <text
+ type="string"
+ length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain0_label"
+ left="48"
+ top_delta="0"
+ width="62">
+ 1
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain1_label"
+ left_delta="110"
+ top_delta="0"
+ width="62">
+ 2
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain2_label"
+ left_delta="110"
+ top_delta="0"
+ width="62">
+ 3
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="center"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain3_label"
+ left_delta="110"
+ top_delta="0"
+ width="62">
+ 4
+ </text>
+ <text
+ type="string"
+ length="1"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain0ScaleU_label"
+ left="10"
+ top_pad="0"
+ width="170">
+ Scale u
+ </text>
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left="46"
+ min_val="-100"
+ max_val="100"
+ name="terrain0ScaleU"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-100"
+ max_val="100"
+ name="terrain1ScaleU"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-100"
+ max_val="100"
+ name="terrain2ScaleU"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-100"
+ max_val="100"
+ name="terrain3ScaleU"
+ width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainScaleU_horizontal"
+ width="432" />
+ <text
+ type="string"
+ length="1"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain0ScaleV_label"
+ left="10"
+ top_pad="0"
+ width="170">
+ Scale v
+ </text>
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale v"
+ label_width="0"
+ layout="topleft"
+ left="46"
+ min_val="-100"
+ max_val="100"
+ name="terrain0ScaleV"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-100"
+ max_val="100"
+ name="terrain1ScaleV"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-100"
+ max_val="100"
+ name="terrain2ScaleV"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="1"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-100"
+ max_val="100"
+ name="terrain3ScaleV"
+ width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainScaleV_horizontal"
+ width="432" />
+ <text
+ type="string"
+ length="1"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain0Rotation_label"
+ left="10"
+ top_pad="0"
+ width="170">
+ Rotation
+ </text>
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Rotation"
+ label_width="0"
+ layout="topleft"
+ left="46"
+ min_val="-360"
+ max_val="360"
+ name="terrain0Rotation"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-360"
+ max_val="360"
+ name="terrain1Rotation"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-360"
+ max_val="360"
+ name="terrain2Rotation"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-360"
+ max_val="360"
+ name="terrain3Rotation"
+ width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainRotation_horizontal"
+ width="432" />
+ <text
+ type="string"
+ length="1"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain0OffsetU_label"
+ left="10"
+ top_pad="0"
+ width="170">
+ Offset y
+ </text>
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Offset u"
+ label_width="0"
+ layout="topleft"
+ left="46"
+ min_val="-999"
+ max_val="999"
+ name="terrain0OffsetU"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-999"
+ max_val="999"
+ name="terrain1OffsetU"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-999"
+ max_val="999"
+ name="terrain2OffsetU"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-999"
+ max_val="999"
+ name="terrain3OffsetU"
+ width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainOffsetU_horizontal"
+ width="432" />
+ <text
+ type="string"
+ length="1"
+ halign="left"
+ valign="center"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ name="terrain0OffsetV_label"
+ left="10"
+ top_pad="0"
+ width="170">
+ Offset v
+ </text>
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Offset v"
+ label_width="0"
+ layout="topleft"
+ left="46"
+ min_val="-999"
+ max_val="999"
+ name="terrain0OffsetV"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-999"
+ max_val="999"
+ name="terrain1OffsetV"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-999"
+ max_val="999"
+ name="terrain2OffsetV"
+ width="64" />
+ <spinner
+ follows="left|top"
+ height="19"
+ initial_value="0"
+ label="Scale u"
+ label_width="0"
+ layout="topleft"
+ left_delta="110"
+ min_val="-999"
+ max_val="999"
+ name="terrain3OffsetV"
+ width="64" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="8"
+ top_pad="8"
+ name="terrainOffsetV_horizontal"
+ width="432" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 59aaf7f74a..0000000000
--- a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="Depurador de obtención de texturas">
- <text name="total_num_fetched_label">
- 1, Número total de texturas obtenidas: [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, Número total de solicitudes de obtención: [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, Número total de aciertos de caché: [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, Número total de texturas visibles: [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, Número total de solicitudes de obtención de texturas visibles: [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, Número total de datos obtenidos: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
- </text>
- <text name="total_fetched_vis_data_label">
- 7, Número total de datos visibles: [SIZE1] KB, Datos descodificados: [SIZE2] KB
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, Número total de datos representados: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
- </text>
- <text name="total_time_cache_read_label">
- 9, Tiempo total en lecturas de caché: [TIME] segundos
- </text>
- <text name="total_time_cache_write_label">
- 10, Tiempo total en escrituras de caché: [TIME] segundos
- </text>
- <text name="total_time_decode_label">
- 11, Tiempo total en descodificaciones: [TIME] segundos
- </text>
- <text name="total_time_gl_label">
- 12, Tiempo total en la creación de texturas gl: [TIME] segundos
- </text>
- <text name="total_time_http_label">
- 13, Tiempo total en obtención de HTTP: [TIME] segundos
- </text>
- <text name="total_time_fetch_label">
- 14, Tiempo total en obtención completa: [TIME] segundos
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, Volviendo a obtener visibles de la caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, Volviendo a obtener todas las texturas de caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, Volviendo a obtener visibles de HTTP, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, Volviendo a obtener todas las texturas de HTTP, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
- </text>
- <spinner label="19, Proporción de texeles/píxeles:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20, Fuente de texturas:
- </text>
- <radio_group name="texture_source">
- <radio_item label="Caché + HTTP" name="0"/>
- <radio_item label="Solo HTTP" name="1"/>
- </radio_group>
- <button label="Iniciar" name="start_btn"/>
- <button label="Restablecer" name="clear_btn"/>
- <button label="Cerrar" name="close_btn"/>
- <button label="Lectura de caché" name="cacheread_btn"/>
- <button label="Escritura de caché" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="Descodificar" name="decode_btn"/>
- <button label="Textura GL" name="gl_btn"/>
- <button label="Volver a obtener caché de vis." name="refetchviscache_btn"/>
- <button label="Volver a obtener toda la caché" name="refetchallcache_btn"/>
- <button label="Volver a obtener HTTP de vis." name="refetchvishttp_btn"/>
- <button label="Volver a obtener todo el HTTP" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
deleted file mode 100644
index caae15ea17..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="Outil de débogage de la récupération des textures">
- <text name="total_num_fetched_label">
- 1, nombre total de textures récupérées : [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, nombre total de demandes de récupération : [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, nombre total de présences dans le cache : [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, nombre total de textures visibles : [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, nombre total de demandes de récupération de textures visibles : [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, nombre total de données récupérées : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
- </text>
- <text name="total_fetched_vis_data_label">
- 7, nombre total de données visibles : [SIZE1] Ko, données décodées : [SIZE2] Ko
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, nombre total de données rendues : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
- </text>
- <text name="total_time_cache_read_label">
- 9, durée totale des lectures du cache : [TIME] secondes
- </text>
- <text name="total_time_cache_write_label">
- 10, durée totale des écritures du cache : [TIME] secondes
- </text>
- <text name="total_time_decode_label">
- 11, durée totale des décodages : [TIME] secondes
- </text>
- <text name="total_time_gl_label">
- 12, durée totale de la création de textures GL : [TIME] secondes
- </text>
- <text name="total_time_http_label">
- 13, durée totale de la récupération HTTP : [TIME] secondes
- </text>
- <text name="total_time_fetch_label">
- 14, durée totale de la récupération intégrale : [TIME] secondes
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, nouvelle récupération des données visibles du cache, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, nouvelle récupération de toutes les textures du cache, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, nouvelle récupération des données visibles de la requête HTTP, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, nouvelle récupération de toutes les textures de la requête HTTP, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
- </text>
- <spinner label="19, taux de texels/pixels :" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20, source des textures :
- </text>
- <radio_group name="texture_source">
- <radio_item label="Cache + HTTP" name="0"/>
- <radio_item label="HTTP uniquement" name="1"/>
- </radio_group>
- <button label="Démarrer" name="start_btn"/>
- <button label="Réinitialiser" name="clear_btn"/>
- <button label="Fermer" name="close_btn"/>
- <button label="Lecture du cache" name="cacheread_btn"/>
- <button label="Écriture du cache" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="Décoder" name="decode_btn"/>
- <button label="Texture GL" name="gl_btn"/>
- <button label="Récupérer à nouveau les données visibles du cache" name="refetchviscache_btn"/>
- <button label="Récupérer cache" name="refetchallcache_btn"/>
- <button label="Récupérer à nouveau les données visibles de la requête HTTP" name="refetchvishttp_btn"/>
- <button label="Récupérer HTTP" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 49b6453319..0000000000
--- a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="Debugger recupero texture">
- <text name="total_num_fetched_label">
- 1, Numero totale di texture recuperate: [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, Numero totale di richieste di recupero: [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, Numero totale di recuperi dalla cache: [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, Numero totale di texture visibili: [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, Numero totale di richieste di fetching texture visibili: [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, Numero totale di fetching dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <text name="total_fetched_vis_data_label">
- 7, Numero totale di dati visibili: [SIZE1] KB, Dati decodificati: [SIZE2] KB
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, Numero totale di rendering dei dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
- </text>
- <text name="total_time_cache_read_label">
- 9, Tempo totale letture cache: [TIME] secondi
- </text>
- <text name="total_time_cache_write_label">
- 10, Tempo totale scrittura cache: [TIME] secondi
- </text>
- <text name="total_time_decode_label">
- 11, Tempo totale decodifica: [TIME] secondi
- </text>
- <text name="total_time_gl_label">
- 12, Tempo totale creazione texture gl: [TIME] secondi
- </text>
- <text name="total_time_http_label">
- 13, Tempo totale fetching HTTP: [TIME] secondi
- </text>
- <text name="total_time_fetch_label">
- 14, Tempo totale complessivo fetching: [TIME] secondi
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, Nuovo fetching elementi visibili dalla cache, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, Nuovo fetching di tutte le texture dalla cache, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, Nuovo fetching elementi visibili da HTTP, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, Nuovo fetching di tutte le texture da HTTP, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
- </text>
- <spinner label="19, Rapporto Texel/Pixel:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20, Fonte texture:
- </text>
- <radio_group name="texture_source">
- <radio_item label="Cache + HTTP" name="0"/>
- <radio_item label="Solo HTTP" name="1"/>
- </radio_group>
- <button label="Attiva" name="start_btn"/>
- <button label="Reimposta" name="clear_btn"/>
- <button label="Chiudi" name="close_btn"/>
- <button label="Lettura cache" name="cacheread_btn"/>
- <button label="Scrittura cache" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="Decodifica" name="decode_btn"/>
- <button label="Texture GL" name="gl_btn"/>
- <button label="Nuovo fetch visibili cache" name="refetchviscache_btn"/>
- <button label="Nuovo fetching di tutta la cache" name="refetchallcache_btn"/>
- <button label="Nuovo fetch visibili HTTP" name="refetchvishttp_btn"/>
- <button label="Nuovo fetching di tutto il contenuto HTTP" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
deleted file mode 100644
index 96809924c1..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="outfit_photo_preview">
- <floater.string name="Title">
- テスクチャ:[NAME]
- </floater.string>
- <floater.string name="exceed_limits">
- アウトフィット画像の最大サイズは[MAX_WIDTH]✕[MAX_HEIGHT]です。他のテスクチャを選択してください。
- </floater.string>
- <floater.string name="photo_confirmation">
- この画像を[OUTFIT]のアウトフィット画像にしますか?
- </floater.string>
- <text name="dimensions">
- [WIDTH]px✕[HEIGHT]px
- </text>
- <text name="notification"/>
- <button label="OK" name="ok_btn"/>
- <button label="キャンセル" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
deleted file mode 100644
index 0b8030048d..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_simple_outfit_snapshot.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="simple_outfit_snapshot" title="アウトフィットのスナップショット">
- <ui_ctrl name="thumbnail_placeholder"/>
- <button label="画像を撮影" name="new_snapshot_btn"/>
- <button label="保存(L$ [UPLOAD_COST])" name="save_btn"/>
- <button label="キャンセル" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
deleted file mode 100644
index c22cbba0d5..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="テクスチャ取得デバッガ">
- <text name="total_num_fetched_label">
- 1,取得したテクスチャの合計数:[NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2,取得リクエストの合計数:[NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3,キャッシュヒットの合計数:[NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4,表示テクスチャの合計数:[NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5,表示テクスチャ取得リクエストの合計数:[NUM]
- </text>
- <text name="total_fetched_data_label">
- 6,取得したデータの合計数:[SIZE1]㎅、デコードされたデータ:[SIZE2]㎅、[PIXEL]メガピクセル
- </text>
- <text name="total_fetched_vis_data_label">
- 7,表示データの合計数:[SIZE1]㎅、デコードされたデータ:[SIZE2]㎅
- </text>
- <text name="total_fetched_rendered_data_label">
- 8,レンダリングされたデータの合計数:[SIZE1]㎅、デコードされたデータ:[SIZE2]㎅、[PIXEL]メガピクセル
- </text>
- <text name="total_time_cache_read_label">
- 9,キャッシュ読み取りの合計時間:[TIME]秒
- </text>
- <text name="total_time_cache_write_label">
- 10,キャッシュ書き込みの合計時間:[TIME]秒
- </text>
- <text name="total_time_decode_label">
- 11,デコードの合計時間:[TIME]秒
- </text>
- <text name="total_time_gl_label">
- 12,glテクスチャ作成の合計時間:[TIME]秒
- </text>
- <text name="total_time_http_label">
- 13,HTTP取得の合計時間:[TIME]秒
- </text>
- <text name="total_time_fetch_label">
- 14,取得全体の合計時間:[TIME]秒
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15,キャッシュから表示テクスチャを再取得、時間:[TIME]秒、取得:[SIZE]㎅、[PIXEL]メガピクセル
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16,キャッシュからすべてのテクスチャを再フェッチ中、時間:[TIME]秒、フェッチ済み:[SIZE]㎅、[PIXEL]メガピクセル
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17,HTTPから可視ファイルを再フェッチ中、時間:[TIME]秒、フェッチ済み:[SIZE]㎅、[PIXEL]メガピクセル
- </text>
- <text name="total_time_refetch_all_http_label">
- 18,HTTPからすべてのテクスチャを再フェッチ中、時間:[TIME]秒、フェッチ済み:[SIZE]㎅、[PIXEL]メガピクセル
- </text>
- <spinner label="19、テセル/ピクセル比:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20、テクスチャ ソース:
- </text>
- <radio_group name="texture_source">
- <radio_item label="キャッシュ + HTTP" name="0"/>
- <radio_item label="HTTP のみ" name="1"/>
- </radio_group>
- <button label="開始" name="start_btn"/>
- <button label="リセット" name="clear_btn"/>
- <button label="閉じる" name="close_btn"/>
- <button label="キャッシュ読み取り" name="cacheread_btn"/>
- <button label="キャッシュ書き込み" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="デコード" name="decode_btn"/>
- <button label="GLテクスチャ" name="gl_btn"/>
- <button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/>
- <button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn"/>
- <button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/>
- <button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml b/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
deleted file mode 100644
index 18aca0dafc..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_preferences_grids.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="グリッド" name="grids">
- <text name="add_grid_text">
- 新しいグリッドを追加:
- </text>
- <line_editor name="add_grid" label="ログインURIを入力"/>
- <button label="追加" name="add_grid_commit"/>
- <text name="manage_grid_text">
- グリッド管理:
- </text>
- <scroll_list name="grid_list">
- <scroll_list.columns label="グリッド名" name="grid_label"/>
- <scroll_list.columns label="ログインURI" name="login_uri"/>
- <scroll_list.commit_callback function="Pref.SelectGrid"/>
- </scroll_list>
- <button label="有効化" name="activate_grid"/>
- <button label="リフレッシュ" name="refresh_grid"/>
- <button label="削除" name="remove_grid"/>
- <button label="デバッグ" name="debug_grid"/>
- <check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check" tool_tip="ログイン画面にグリッド選択を表示して、他のワールドにログインします。"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/pl/floater_outfit_photo_preview.xml
deleted file mode 100644
index 8c7de8e34e..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_outfit_photo_preview.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="outfit_photo_preview">
- <floater.string name="Title">
- Tekstura: [NAME]
- </floater.string>
- <floater.string name="exceed_limits">
- Maks. rozmiar zdjęcia stroju to [MAX_WIDTH]*[MAX_HEIGHT]. Wybierz inną teksturę.
- </floater.string>
- <floater.string name="photo_confirmation">
- Ustawić to zdjęcie dla stroju [OUTFIT]?
- </floater.string>
- <button label="Anuluj" name="cancel_btn" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
deleted file mode 100644
index 1a60b557b2..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="simple_outfit_snapshot" title="ZDJĘCIE STROJU">
- <button label="Zrób zdjęcie" name="new_snapshot_btn" />
- <button label="Zapisz ([UPLOAD_COST]L$)" name="save_btn" />
- <button label="Anuluj" name="cancel_btn" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pl/floater_texture_fetch_debugger.xml
deleted file mode 100644
index fc0687f333..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="TexFetchDebugger" title="Debuger ładowania tekstur">
- <text name="total_num_fetched_label">
- 1, Pobranych tekstur: [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, Próśb o pobranie: [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, Trafień w cache: [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, Widocznych tekstur: [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, Próśb o pobranie widocznych tekstur: [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, Pobrane: [SIZE1]KB, zdekodowane: [SIZE2]KB, [PIXEL]MPikseli
- </text>
- <text name="total_fetched_vis_data_label">
- 7, Widoczne: [SIZE1]KB, zdekodowane: [SIZE2]KB
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, Zrenderowane: [SIZE1]KB, zdekodowane: [SIZE2]KB, [PIXEL]MPikseli
- </text>
- <text name="total_time_cache_read_label">
- 9, Odczyty cache: [TIME] sekund
- </text>
- <text name="total_time_cache_write_label">
- 10, Zapisy cache: [TIME] sekund
- </text>
- <text name="total_time_decode_label">
- 11, Zdekodowania: [TIME] sekund
- </text>
- <text name="total_time_gl_label">
- 12, Tworzenie tekstur GL: [TIME] sekund
- </text>
- <text name="total_time_http_label">
- 13, Pobieranie przez HTTP: [TIME] sekund
- </text>
- <text name="total_time_fetch_label">
- 14, Pobieranie w sumie: [TIME] sekund
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, Ponowne pobier. widocznych z cache, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, Ponowne pobier. wszystkich z cache, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, Ponowne pobier. widocznych z HTTP, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, Ponowne pobier. wszystkich z HTTP, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
- </text>
- <spinner label="19, Wspł. Teksel/Piksel:" name="texel_pixel_ratio" />
- <text name="texture_source_label">
- 20, Źródło tekstur:
- </text>
- <radio_group name="texture_source">
- <radio_item label="Tylko HTTP" name="1" />
- </radio_group>
- <button label="Zamknij" name="close_btn" />
- <button label="Odcz. cache" name="cacheread_btn" />
- <button label="Zapis cache" name="cachewrite_btn" />
- <button label="Dekoduj" name="decode_btn" />
- <button label="Tekstura GL" name="gl_btn" />
- <button label="Odśw. przez cache" name="refetchviscache_btn" />
- <button label="Odśw. całe cache" name="refetchallcache_btn" />
- <button label="Odśw. przez HTTP" name="refetchvishttp_btn" />
- <button label="Odśw. całe HTTP" name="refetchallhttp_btn" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 0e897aea09..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="Depurador de obtenção de textura">
- <text name="total_num_fetched_label">
- 1, Número total de texturas obtidas: [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, Número total de solicitações de obtenção: [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, Número total de acertos de cache: [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, Número total de texturas visíveis: [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, Número total de solicitações de obtenção de texturas visíveis: [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, Número total de dados obtidos: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
- </text>
- <text name="total_fetched_vis_data_label">
- 7, Número total de dados visíveis: [SIZE1]KB, Dados decodificados: [SIZE2]KB
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, Número total de dados renderizados: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
- </text>
- <text name="total_time_cache_read_label">
- 9, Tempo total de leituras de cache: [TIME] segundos
- </text>
- <text name="total_time_cache_write_label">
- 10, Tempo total de gravações em cache: [TIME] segundos
- </text>
- <text name="total_time_decode_label">
- 11, Tempo total das decodificações: [TIME] segundos
- </text>
- <text name="total_time_gl_label">
- 12, Tempo total de criação de texturas gl: [TIME] segundos
- </text>
- <text name="total_time_http_label">
- 13, Tempo total de obtenção de HTTP: [TIME] segundos
- </text>
- <text name="total_time_fetch_label">
- 14, Tempo total de obtenção completa: [TIME] segundos
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, Obtendo novamente visíveis do cache, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, Obtendo novamente todas as texturas do cache, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, Obtendo novamente visíveis do HTTP, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, Obtendo novamente todas as texturas do HTTP, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
- </text>
- <spinner label="19, Proporção de texel/pixel:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20, Origem da textura:
- </text>
- <radio_group name="texture_source">
- <radio_item label="Cache + HTTP" name="0"/>
- <radio_item label="Apenas HTTP" name="1"/>
- </radio_group>
- <button label="Iniciar" name="start_btn"/>
- <button label="Redefinir" name="clear_btn"/>
- <button label="Fechar" name="close_btn"/>
- <button label="Leitura do cache" name="cacheread_btn"/>
- <button label="Gravação em cache" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="Decodificar" name="decode_btn"/>
- <button label="Textura GL" name="gl_btn"/>
- <button label="Obter novamente cache visível" name="refetchviscache_btn"/>
- <button label="Obter todo o cache novamente" name="refetchallcache_btn"/>
- <button label="Obter novamente HTTP visível" name="refetchvishttp_btn"/>
- <button label="Obter todo o HTTP novamente" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 628e6c5c87..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="Отладчик извлечения текстур">
- <text name="total_num_fetched_label">
- 1, Общее количество извлеченных текстур: [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, Общее количество запросов на извлечение: [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, Общее количество попаданий в кэш: [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, Общее количество видимых текстур: [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, Общее количество запросов на извлечение видимых текстур: [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, Общий объем извлеченных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов
- </text>
- <text name="total_fetched_vis_data_label">
- 7, Общий объем видимых данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, Общий объем визуализированных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов
- </text>
- <text name="total_time_cache_read_label">
- 9, Общее время чтения из кэша: [TIME] с
- </text>
- <text name="total_time_cache_write_label">
- 10, Общее время записи в кэш: [TIME] с
- </text>
- <text name="total_time_decode_label">
- 11, Общее время декодирования: [TIME] с
- </text>
- <text name="total_time_gl_label">
- 12, Общее время создания текстур: [TIME] с
- </text>
- <text name="total_time_http_label">
- 13, Общее время HTTP-извлечения: [TIME] с
- </text>
- <text name="total_time_fetch_label">
- 14, Общее время полного извлечения: [TIME] с
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, Повторное извлечение из кэша, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, Повторное извлечение всех текстур из кэша, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, Повторное извлечение из HTTP, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, Повторное извлечение всех текстур из HTTP, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
- </text>
- <spinner label="19, Отношение текселы/пикселы:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20, Истояник текстур:
- </text>
- <radio_group name="texture_source">
- <radio_item label="Кэш + HTTP" name="0"/>
- <radio_item label="Только HTTP" name="1"/>
- </radio_group>
- <button label="Пуск" name="start_btn"/>
- <button label="Сброс" name="clear_btn"/>
- <button label="Закрыть" name="close_btn"/>
- <button label="Чтение кэша" name="cacheread_btn"/>
- <button label="Запись в кэш" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="Декодировать" name="decode_btn"/>
- <button label="Текстура GL" name="gl_btn"/>
- <button label="Повторно извлечь из кэша" name="refetchviscache_btn"/>
- <button label="Повторно извлечь все из кэша" name="refetchallcache_btn"/>
- <button label="Повторно извлечь из HTTP" name="refetchvishttp_btn"/>
- <button label="Повторно извлечь все из HTTP" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 42426225c7..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="Doku Alımı Hata Ayıklayıcı">
- <text name="total_num_fetched_label">
- 1, Alınan dokuların toplam sayısı: [NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2, Toplam alım talebi sayısı: [NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3, Toplam önbellek isabet sayısı: [NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4, Görünür dokuların toplam sayısı: [NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5, Görünür dokuların alınması için toplam talep sayısı: [NUM]
- </text>
- <text name="total_fetched_data_label">
- 6, Alınan verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel
- </text>
- <text name="total_fetched_vis_data_label">
- 7, Görünür verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB
- </text>
- <text name="total_fetched_rendered_data_label">
- 8, İşlenen verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel
- </text>
- <text name="total_time_cache_read_label">
- 9, Önbellek okunması için toplam süre: [TIME] saniye
- </text>
- <text name="total_time_cache_write_label">
- 10, Önbellek yazılması için toplam süre: [TIME] saniye
- </text>
- <text name="total_time_decode_label">
- 11, Şifre çözülmesi için toplam süre: [TIME] saniye
- </text>
- <text name="total_time_gl_label">
- 12, GL doku oluşturma için toplam süre: [TIME] saniye
- </text>
- <text name="total_time_http_label">
- 13, HTTP alımı için toplam süre: [TIME] saniye
- </text>
- <text name="total_time_fetch_label">
- 14, Tüm alımlar için toplam süre: [TIME] saniye
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15, Görünür dokuların önbellekten tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16, Tüm dokuların önbellekten tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17, Görünür dokuların HTTP&apos;den tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
- </text>
- <text name="total_time_refetch_all_http_label">
- 18, Tüm dokuların HTTP&apos;den tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
- </text>
- <spinner label="19, Teksel/Piksel Oranı:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20, Doku Kaynağı:
- </text>
- <radio_group name="texture_source">
- <radio_item label="Önbellek + HTTP" name="0"/>
- <radio_item label="Sadece HTTP" name="1"/>
- </radio_group>
- <button label="Başla" name="start_btn"/>
- <button label="Sıfırla" name="clear_btn"/>
- <button label="Kapat" name="close_btn"/>
- <button label="Önbellek Okunması" name="cacheread_btn"/>
- <button label="Önbellek Yazılması" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="Şifre Çöz" name="decode_btn"/>
- <button label="GL Dokusu" name="gl_btn"/>
- <button label="Görünür Dokuları Önbellekten Tekrar Al" name="refetchviscache_btn"/>
- <button label="Tüm Önbelleği Tekrar Al" name="refetchallcache_btn"/>
- <button label="Görünür Dokuları HTTP&apos;den Tekrar Al" name="refetchvishttp_btn"/>
- <button label="Tüm HTTP&apos;yi Tekrar Al" name="refetchallhttp_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 0dcac17a75..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="TexFetchDebugger" title="材質擷取除錯器">
- <text name="total_num_fetched_label">
- 1. 已擷取材質總數:[NUM]
- </text>
- <text name="total_num_fetching_requests_label">
- 2. 總擷取請求數:[NUM]
- </text>
- <text name="total_num_cache_hits_label">
- 3. 快取總讀取數:[NUM]
- </text>
- <text name="total_num_visible_tex_label">
- 4. 可見材質總數:[NUM]
- </text>
- <text name="total_num_visible_tex_fetch_req_label">
- 5. 可見材質擷取總請求數:[NUM]
- </text>
- <text name="total_fetched_data_label">
- 6. 總擷取資料量:[SIZE1] KB,解碼資料量:[SIZE2] KB,[PIXEL] 百萬像素
- </text>
- <text name="total_fetched_vis_data_label">
- 7. 可見資料總量:[SIZE1] KB,解碼資料量:[SIZE2] KB
- </text>
- <text name="total_fetched_rendered_data_label">
- 8. 總呈像資料量:[SIZE1] KB,解碼資料量:[SIZE2] KB,[PIXEL] 百萬像素
- </text>
- <text name="total_time_cache_read_label">
- 9. 快取讀取總時間:[TIME] 秒
- </text>
- <text name="total_time_cache_write_label">
- 10. 快取寫入總時間:[TIME] 秒
- </text>
- <text name="total_time_decode_label">
- 11. 解碼總時間:[TIME] 秒
- </text>
- <text name="total_time_gl_label">
- 12. 建立 gl 材質總時間:[TIME] 秒
- </text>
- <text name="total_time_http_label">
- 13. HTTP 擷取總時間:[TIME] 秒
- </text>
- <text name="total_time_fetch_label">
- 14. 所有擷取動作總時間:[TIME] 秒
- </text>
- <text name="total_time_refetch_vis_cache_label">
- 15. 自快取重新擷取可見材質,時間:[TIME] 秒,擷取量:[SIZE] KB,[PIXEL] 百萬像素
- </text>
- <text name="total_time_refetch_all_cache_label">
- 16. 從快取重新擷取所有材質,時間:[TIME] 秒,擷取量:[SIZE] KB,[PIXEL] 百萬像素
- </text>
- <text name="total_time_refetch_vis_http_label">
- 17. 自 HTTP 重新擷取可見材質,時間:[TIME] 秒,擷取量:[SIZE] KB,[PIXEL] 百萬像素
- </text>
- <text name="total_time_refetch_all_http_label">
- 18. 自 HTTP 重新擷取所有材質,時間:[TIME] 秒,擷取量:[SIZE] KB,[PIXEL] 百萬像素
- </text>
- <spinner label="19. 材質/像素比率:" name="texel_pixel_ratio"/>
- <text name="texture_source_label">
- 20. 材質來源:
- </text>
- <radio_group name="texture_source">
- <radio_item label="快取 + HTTP" name="0"/>
- <radio_item label="僅限 HTTP" name="1"/>
- </radio_group>
- <button label="開始" name="start_btn"/>
- <button label="重設" name="clear_btn"/>
- <button label="關閉" name="close_btn"/>
- <button label="快取讀取" name="cacheread_btn"/>
- <button label="快取寫入" name="cachewrite_btn"/>
- <button label="HTTP" name="http_btn"/>
- <button label="解碼" name="decode_btn"/>
- <button label="GL 材質" name="gl_btn"/>
- <button label="快取重取可見材質" name="refetchviscache_btn"/>
- <button label="重新擷取所有快取" name="refetchallcache_btn"/>
- <button label="HTTP 重取可見材質" name="refetchvishttp_btn"/>
- <button label="重新擷取所有 HTTP" name="refetchallhttp_btn"/>
-</floater>