diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
39 files changed, 970 insertions, 960 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/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml index 42ba5b5269..7738427fe3 100644 --- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml @@ -10,7 +10,7 @@ <spinner label="Obere Terraingrenze" name="terrain_raise_spin"/> <spinner label="Untere Terraingrenze" name="terrain_lower_spin"/> <text name="detail_texture_text"> - Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 1024x1024) + Terraintexturen </text> <text name="height_text_lbl"> 1 (niedrig) 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 bc237322af..64f612f943 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 @@ -128,6 +128,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" @@ -335,21 +371,9 @@ name="FSAADisabled" value="0" /> <combo_box.item - label="2x" - name="2x" + label="FXAA" + name="FXAA" value="2" /> - <combo_box.item - label="4x" - name="4x" - value="4" /> - <combo_box.item - label="8x" - name="8x" - value="8" /> - <combo_box.item - label="16x" - name="16x" - value="16" /> </combo_box> <text type="string" @@ -357,44 +381,23 @@ follows="left|top" height="16" layout="topleft" - left_pad="10" - name="antialiasing restart" - top_delta="0" - width="130"> - (requires restart) - </text> - <view_border - bevel_style="in" - height="322" - layout="topleft" - left="385" - name="vert_border" - top="16" - width="0"/> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" name="MeshText" - top_delta="20" - left="400" - top="21" + top_delta="16" + left="10" width="128"> - Mesh + Mesh </text> <slider control_name="RenderTerrainLODFactor" - follows="left|top" + follows="topleft" height="16" increment="0.125" initial_value="160" label="Terrain Mesh Detail:" label_width="185" layout="topleft" - left="420" + left="30" min_val="1" max_val="2" name="TerrainMeshDetail" @@ -408,7 +411,7 @@ <text type="string" length="1" - follows="left|top" + follows="topleft" height="16" layout="topleft" name="TerrainMeshDetailText" @@ -416,19 +419,19 @@ top_delta="0" left_delta="304" width="65"> - Low + Low </text> <slider control_name="RenderTreeLODFactor" - follows="left|top" + follows="topleft" height="16" increment="0.125" initial_value="160" label="Trees:" label_width="185" layout="topleft" - left="420" + left="30" name="TreeMeshDetail" show_text="false" top_delta="16" @@ -447,7 +450,7 @@ top_delta="0" left_delta="304" width="65"> - Low + Low </text> <slider @@ -459,7 +462,7 @@ label="Objects:" label_width="185" layout="topleft" - left="420" + left="30" min_val="0" max_val="4" name="ObjectMeshDetail" @@ -480,7 +483,7 @@ top_delta="0" left_delta="304" width="65"> - Low + Low </text> <slider @@ -491,7 +494,7 @@ label="Flexiprims:" label_width="185" layout="topleft" - left="420" + left="30" name="FlexibleMeshDetail" show_text="false" top_delta="16" @@ -510,8 +513,28 @@ top_delta="0" left_delta="304" width="65"> - Low + Low </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left_pad="10" + name="antialiasing restart" + top_delta="0" + width="130"> + (requires restart) + </text> + <view_border + bevel_style="in" + height="322" + layout="topleft" + left="385" + name="vert_border" + top="16" + width="0"/> <text type="string" @@ -520,7 +543,7 @@ height="16" layout="topleft" name="ShadersText" - top_delta="20" + top_delta="-10" left="400" width="128"> Shaders @@ -534,7 +557,7 @@ layout="topleft" left="420" name="TransparentWater" - top_delta="16" + top_delta="18" width="300"> <check_box.commit_callback function="Pref.RenderOptionUpdate" /> @@ -555,7 +578,7 @@ max_val="128" name="SkyMeshDetail" show_text="false" - top_delta="16" + top_delta="22" width="260"> <slider.commit_callback function="Pref.UpdateSliderText" @@ -583,7 +606,7 @@ layout="topleft" left="420" name="UseSSAO" - top_delta="16" + top_delta="22" width="240"> <check_box.commit_callback function="Pref.RenderOptionUpdate" /> @@ -597,7 +620,7 @@ layout="topleft" left="420" name="UseDoF" - top_delta="16" + top_delta="20" width="240"> <check_box.commit_callback function="Pref.RenderOptionUpdate" /> @@ -612,7 +635,7 @@ left="420" name="RenderShadowDetailText" text_readonly_color="LabelDisabledColor" - top_delta="16" + top_delta="22" width="128"> Shadows: </text> @@ -646,7 +669,7 @@ layout="topleft" left="420" name="ScreenSpaceReflections" - top_delta="16" + top_delta="24" width="240"> <check_box.commit_callback function="Pref.RenderOptionUpdate" /> @@ -661,7 +684,7 @@ left="420" name="ReflectionDetailText" text_readonly_color="LabelDisabledColor" - top_delta="16" + top_delta="22" width="128"> Reflection Detail: </text> @@ -697,7 +720,7 @@ left="420" name="ReflectionProbeText" text_readonly_color="LabelDisabledColor" - top_delta="16" + top_delta="22" width="128"> Reflection Coverage: </text> @@ -743,10 +766,106 @@ max_val="1.5" name="RenderExposure" show_text="true" - top_delta="20" + top_delta="24" width="260"> </slider> + <!-- Mirror settings. --> + <check_box + control_name="RenderMirrors" + height="16" + initial_value="false" + label="Mirrors" + layout="topleft" + left="420" + name="Mirrors" + top_delta="24" + width="240"> + <check_box.commit_callback + function="Pref.RenderOptionUpdate" /> + </check_box> + + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="420" + name="MirrorResolutionText" + text_readonly_color="LabelDisabledColor" + top_delta="22" + width="128"> + Mirror Resolution: + </text> + + <combo_box + control_name="RenderHeroProbeResolution" + height="18" + layout="topleft" + left_delta="130" + top_delta="0" + name="MirrorResolution" + width="150"> + <combo_box.item + label="256" + name="0" + value="256"/> + <combo_box.item + label="512" + name="1" + value="512"/> + <combo_box.item + label="1024" + name="2" + value="1024"/> + <combo_box.item + label="2048" + name="3" + value="2048"/> + </combo_box> + + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="420" + name="HeroProbeUpdateText" + text_readonly_color="LabelDisabledColor" + top_delta="22" + width="128"> + Mirror Update Rate: + </text> + + <combo_box + control_name="RenderHeroProbeUpdateRate" + height="18" + layout="topleft" + left_delta="130" + top_delta="0" + name="HeroProbeUpdateRate" + width="150"> + <combo_box.item + label="Every Frame" + name="0" + value="1"/> + <combo_box.item + label="Every 2nd Frame" + 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"/> + </combo_box> + <!-- End of mirror settings --> + <!-- End of Advanced Settings block --> <view_border bevel_style="in" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 490b516ac6..3ee4a354d4 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2410,7 +2410,6 @@ even though the user gets a free copy. name="object_horizontal" top_pad="10" width="278" /> - <check_box height="16" label="Light" @@ -2560,16 +2559,52 @@ even though the user gets a free copy. name="Box" value="Box"/> </combo_box> + <check_box - height="16" - label="Dynamic" + height="16" + label="Dynamic" + layout="topleft" + left="10" + name="Probe Dynamic" + tool_tip="When enabled, Avatars will appear in reflections within this probe's influence volume." + bottom_delta="19" + width="60" /> + + <text + bottom_delta="-8" + type="string" + length="1" + follows="left|top" + height="10" layout="topleft" left="10" - name="Probe Dynamic" - tool_tip="When enabled, Avatars will appear in reflections within this probe's influence volume." - bottom_delta="19" - width="60" /> - <spinner bottom_delta="19" + name="Probe Update Label" + text_readonly_color="LabelDisabledColor" + width="100"> + Probe Update + </text> + <combo_box + height="19" + top_delta="0" + left="144" + follows="left|top" + name="Probe Update Type" + tool_tip="Determines how the probe updates. Static updates the slowest and without avatars. Dynamic updates more frequently, with avatars visible in the probes. Mirror turns this probe into a realtime planar projected mirror probe, but does not calculate ambiance." + width="108"> + <combo_box.item + label="Static" + name="Static" + value="Static" /> + <combo_box.item + label="Dynamic" + name="Dynamic" + value="Dynamic"/> + <combo_box.item + label="Mirror" + name="Mirror" + value="Mirror"/> + </combo_box> + <spinner bottom_delta="17" decimal_digits="3" follows="left|top" height="16" 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_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index 13064db712..ae96289f36 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -13,7 +13,7 @@ name="upload" tear_off="true"> <menu_item_call - label="Image (L$[COST])..." + label="Image..." layout="topleft" name="Upload Image" shortcut="control|U"> 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 53f703e56d..9697774fd9 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1620,7 +1620,7 @@ function="World.EnvPreset" name="Upload" tear_off="true"> <menu_item_call - label="Image (L$[COST])..." + label="Image..." layout="topleft" name="Upload Image" shortcut="control|U"> @@ -2039,7 +2039,57 @@ function="World.EnvPreset" function="Advanced.ToggleRenderType" parameter="simple" /> </menu_item_check> - <menu_item_check + <menu_item_check + label="Materials" + name="Rendering Type Materials"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="materials" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="materials" /> + </menu_item_check> + <menu_item_check + label="Alpha Mask" + name="Rendering Type Alpha Mask"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="alpha_mask" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="alpha_mask" /> + </menu_item_check> + <menu_item_check + label="Fullbright Alpha Mask" + name="Rendering Type Fullbright Alpha Mask"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="fullbright_alpha_mask" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="fullbright_alpha_mask" /> + </menu_item_check> + <menu_item_check + label="Glow" + name="Rendering Type Glow"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="glow" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="glow" /> + </menu_item_check> + <menu_item_check + label="Fullbright" + name="Rendering Type Glow"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="fullbright" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="fullbright" /> + </menu_item_check> + <menu_item_check label="Alpha" name="Rendering Type Alpha" shortcut="control|alt|shift|2"> @@ -2794,6 +2844,30 @@ 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_click + function="Advanced.ClickGLTFOpen" /> + </menu_item_call> + <menu_item_call + label="Save As..." + name="Save As..."> + <menu_item_call.on_click + function="Advanced.ClickGLTFSaveAs" /> + </menu_item_call> + <menu_item_call + label="Decompose..." + name="Decompose..."> + <menu_item_call.on_click + function="Advanced.ClickGLTFDecompose" /> + </menu_item_call> + </menu> <menu create_jump_keys="true" label="Render Tests" @@ -2840,6 +2914,12 @@ function="World.EnvPreset" <menu_item_call.on_click function="Advanced.ClickRenderBenchmark" /> </menu_item_call> + <menu_item_call + label="HDRI Preview" + name="HDRI Preview"> + <menu_item_call.on_click + function="Advanced.ClickHDRIPreview" /> + </menu_item_call> </menu> <menu create_jump_keys="true" @@ -2877,6 +2957,16 @@ function="World.EnvPreset" parameter="octree" /> </menu_item_check> <menu_item_check + label="GLTF Nodes" + name="GLTF Nodes"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="nodes" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="nodes" /> + </menu_item_check> + <menu_item_check label="Shadow Frusta" name="Shadow Frusta"> <menu_item_check.on_check @@ -3319,6 +3409,13 @@ function="World.EnvPreset" <menu_item_call.on_click function="Advanced.ClearShaderCache" /> </menu_item_call> + <menu_item_call + enabled="true" + label="Rebuild Terrain" + name="Rebuild Terrain"> + <menu_item_call.on_click + function="Advanced.RebuildTerrain" /> + </menu_item_call> <menu_item_separator /> <menu_item_call enabled="true" @@ -3940,6 +4037,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 3e1b1c4a67..4ed7c5250a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4002,10 +4002,39 @@ Are you sure you want to return objects owned by [USER_NAME]? icon="alertmodal.tga" name="InvalidTerrainBitDepth" type="alertmodal"> + <unique combine="cancel_old" /> Couldn't set region textures: Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH]. -Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click "Apply" again. +Replace texture [TEXTURE_NUM] with an RGB [MAX_SIZE]x[MAX_SIZE] or smaller image then click "Apply" again. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidTerrainAlphaNotFullyLoaded" + type="alertmodal"> + <unique combine="cancel_old" /> +Couldn't set region textures: +Terrain texture [TEXTURE_NUM] is not fully loaded, but is assumed to contain transparency due to a bit depth of [TEXTURE_BIT_DEPTH]. Transparency is not currently supported for terrain textures. + +If texture [TEXTURE_NUM] is opaque, wait for the texture to fully load and then click "Apply" again. + +Alpha is only supported for terrain materials (PBR Metallic Roughness), when alphaMode="MASK" and doubleSided=false. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidTerrainAlpha" + type="alertmodal"> + <unique combine="cancel_old" /> +Couldn't set region textures: +Terrain texture [TEXTURE_NUM] contains transparency. Transparency is not currently supported for terrain textures. + +Replace texture [TEXTURE_NUM] with an opaque RGB image, then click "Apply" again. + +Alpha is only supported for terrain materials (PBR Metallic Roughness), when alphaMode="MASK" and doubleSided=false. <tag>fail</tag> </notification> @@ -4013,10 +4042,55 @@ Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller ima icon="alertmodal.tga" name="InvalidTerrainSize" type="alertmodal"> + <unique combine="cancel_old" /> Couldn't set region textures: Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. -Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click "Apply" again. +Replace texture [TEXTURE_NUM] with an RGB [MAX_SIZE]x[MAX_SIZE] or smaller image then click "Apply" again. + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidTerrainMaterialNotLoaded" + type="alertmodal"> + <unique combine="cancel_old" /> +Couldn't set region materials: +Terrain material [MATERIAL_NUM] is not loaded. + +Wait for the material to load, or replace material [MATERIAL_NUM] with a valid material. + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidTerrainMaterialLoadFailed" + type="alertmodal"> + <unique combine="cancel_old" /> +Couldn't set region materials: +Terrain material [MATERIAL_NUM] failed to load. + +Replace material [MATERIAL_NUM] with a valid material. + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidTerrainMaterialDoubleSided" + type="alertmodal"> + <unique combine="cancel_old" /> +Couldn't set region materials: +Terrain material [MATERIAL_NUM] is double-sided. Double-sided materials are not currently supported for PBR terrain. + +Replace material [MATERIAL_NUM] with a material with doubleSided=false. + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidTerrainMaterialAlphaMode" + type="alertmodal"> + <unique combine="cancel_old" /> +Couldn't set region materials: +Terrain material [MATERIAL_NUM] is using the unsupported alphaMode="[MATERIAL_ALPHA_MODE]". + +Replace material [MATERIAL_NUM] with a material with alphaMode="OPAQUE" or alphaMode="MASK". </notification> <notification @@ -6218,6 +6292,17 @@ Are you sure you want to delete 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" @@ -9253,6 +9338,15 @@ Unable to upload texture: '[NAME]' </notification> <notification + icon="alertmodal.tga" + name="CannotLoad" + type="alertmodal"> + Unable to load [WHAT]. + [REASON] + <tag>fail</tag> + </notification> + + <notification icon="alertmodal.tga" name="CannotUploadMaterial" type="alertmodal"> @@ -12322,5 +12416,27 @@ are wearing now. name="okignore" yestext="OK"/> </notification> - + + <notification + icon="alertmodal.tga" + name="GLTFOpenSelection" + type="alert"> + You must select an object to act as a handle to the GLTF asset you are previewing. + <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> + </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.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index ad41691323..73e0a1000f 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -79,26 +79,55 @@ <text type="string" length="1" + halign="left" + valign="center" follows="left|top" height="20" layout="topleft" - left="10" name="detail_texture_text" - top="110" - width="300"> - Terrain Textures (requires 1024x1024, 24 bit .tga files) + left="10" + top="105" + 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="105" + 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="100" layout="topleft" - left_delta="0" + left="10" name="texture_detail_0" default_image_id="0bc58228-74a0-7e83-89bc-5c23464bcec5" - top_delta="20" + top_delta="30" width="100" /> <texture_picker - follows="left|top" + follows="top" height="100" layout="topleft" left_pad="10" @@ -124,6 +153,50 @@ default_image_id="53a2f406-4895-1d13-d541-d2e3b86bc19c" top_delta="0" width="100" /> + <texture_picker + visible="false" + follows="left|top" + height="100" + 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="100" + 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="100" + 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="100" + 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" @@ -185,6 +258,19 @@ 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" @@ -196,6 +282,18 @@ 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" @@ -207,6 +305,18 @@ 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" 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/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/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml index 9aba5299cb..5e6e89893e 100644 --- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml @@ -12,7 +12,7 @@ del terreno" name="terrain_raise_spin"/> <spinner bottom_delta="-34" label="Límite de bajada del terreno" name="terrain_lower_spin"/> <text name="detail_texture_text"> - Texturas del terreno (requiere archivos .tga de 1024x1024, 24 bits) + Texturas del terreno </text> <text name="height_text_lbl"> 1 (bajo) 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/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml index bbab00ca24..d99948804a 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml @@ -12,7 +12,7 @@ terrain" name="terrain_raise_spin"/> <spinner bottom_delta="-34" label="Limite d'abaissement du terrain" name="terrain_lower_spin"/> <text name="detail_texture_text"> - Textures du terrain (fichiers .tga 1024 x 1024, 24 bit requis) + Textures du terrain </text> <text name="height_text_lbl"> 1 (Bas) 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/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml index e08c55f63b..0583b4e02e 100644 --- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml @@ -12,7 +12,7 @@ terreno" name="terrain_raise_spin"/> <spinner bottom_delta="-34" label="Limite di abbassamento del terreno" name="terrain_lower_spin"/> <text name="detail_texture_text"> - Texture terreno (richiede file 1024x1024, 24 bit .tga) + Texture terreno </text> <text name="height_text_lbl"> 1 (basso) 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="ＯＫ" 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"> - １，取得したテクスチャの合計数：[NUM] - </text> - <text name="total_num_fetching_requests_label"> - ２，取得リクエストの合計数：[NUM] - </text> - <text name="total_num_cache_hits_label"> - ３，キャッシュヒットの合計数：[NUM] - </text> - <text name="total_num_visible_tex_label"> - ４，表示テクスチャの合計数：[NUM] - </text> - <text name="total_num_visible_tex_fetch_req_label"> - ５，表示テクスチャ取得リクエストの合計数：[NUM] - </text> - <text name="total_fetched_data_label"> - ６，取得したデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル - </text> - <text name="total_fetched_vis_data_label"> - ７，表示データの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅ - </text> - <text name="total_fetched_rendered_data_label"> - ８，レンダリングされたデータの合計数：[SIZE1]㎅、デコードされたデータ：[SIZE2]㎅、[PIXEL]メガピクセル - </text> - <text name="total_time_cache_read_label"> - ９，キャッシュ読み取りの合計時間：[TIME]秒 - </text> - <text name="total_time_cache_write_label"> - １０，キャッシュ書き込みの合計時間：[TIME]秒 - </text> - <text name="total_time_decode_label"> - １１，デコードの合計時間：[TIME]秒 - </text> - <text name="total_time_gl_label"> - １２，glテクスチャ作成の合計時間：[TIME]秒 - </text> - <text name="total_time_http_label"> - １３，HTTP取得の合計時間：[TIME]秒 - </text> - <text name="total_time_fetch_label"> - １４，取得全体の合計時間：[TIME]秒 - </text> - <text name="total_time_refetch_vis_cache_label"> - １５，キャッシュから表示テクスチャを再取得、時間：[TIME]秒、取得：[SIZE]㎅、[PIXEL]メガピクセル - </text> - <text name="total_time_refetch_all_cache_label"> - １６，キャッシュからすべてのテクスチャを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル - </text> - <text name="total_time_refetch_vis_http_label"> - １７，HTTPから可視ファイルを再フェッチ中、時間：[TIME]秒、フェッチ済み：[SIZE]㎅、[PIXEL]メガピクセル - </text> - <text name="total_time_refetch_all_http_label"> - １８，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/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml index 5470bd6e3b..11e8d0d169 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml @@ -10,7 +10,7 @@ <spinner label="地形の上昇限度" name="terrain_raise_spin"/> <spinner label="地形の下降限度" name="terrain_lower_spin"/> <text name="detail_texture_text"> - 地形テクスチャ（1024✕1024 の 24 bit .tga ファイル） + 地形テクスチャ </text> <text name="height_text_lbl"> １（低） 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/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml index 2d4286334f..c1dde04ff0 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml @@ -7,7 +7,7 @@ <spinner label="Górny limit terenu" name="terrain_raise_spin" /> <spinner label="Dolny limit terenu" name="terrain_lower_spin" /> <text name="detail_texture_text"> - Tekstury terenu (1024x1024, 24 bitowy plik .tga) + Tekstury terenu </text> <text name="height_text_lbl"> 1 (Nisko) 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/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml index 1d312aeed9..92d6859882 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml @@ -12,7 +12,7 @@ terreno" name="terrain_raise_spin"/> <spinner bottom_delta="-34" label="Limite mais baixo do terreno" name="terrain_lower_spin"/> <text name="detail_texture_text"> - Texturas de terreno (exige arquivos .tga 1024x1024, 24 bit) + Texturas de terreno </text> <text name="height_text_lbl"> 1 (Baixo) 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/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml index 76b4f513a8..2752d409cb 100644 --- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml @@ -10,7 +10,7 @@ <spinner label="Верх. точка ландшафта" name="terrain_raise_spin"/> <spinner label="Ниж. точка ландшафта" name="terrain_lower_spin"/> <text name="detail_texture_text"> - Текстуры ландшафта (требования: 1024x1024, 24-битные, TGA) + Текстуры ландшафта </text> <text name="height_text_lbl"> 1 (Низ) 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'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'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'den Tekrar Al" name="refetchvishttp_btn"/> - <button label="Tüm HTTP'yi Tekrar Al" name="refetchallhttp_btn"/> -</floater> diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml index e25047301d..00560d4c5b 100644 --- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml @@ -10,7 +10,7 @@ <spinner label="Yüzey Yükslt. Limiti" name="terrain_raise_spin"/> <spinner label="Yüzey Alçatma Limiti" name="terrain_lower_spin"/> <text name="detail_texture_text"> - Yüzey Dokuları (1024x1024, 24 bit .tga dosyalar gerektirir) + Yüzey Dokuları </text> <text name="height_text_lbl"> 1 (Düşük) 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> diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml index 81bce46876..8490eeaafc 100644 --- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml @@ -10,7 +10,7 @@ <spinner label="地形提升限制" name="terrain_raise_spin"/> <spinner label="地形降低限制" name="terrain_lower_spin"/> <text name="detail_texture_text"> - 地形材質（須 1024x1024，24 位元 .tga 檔格式） + 地形材質 </text> <text name="height_text_lbl"> 1（低） |