diff options
Diffstat (limited to 'indra/newview/skins')
33 files changed, 1840 insertions, 1025 deletions
diff --git a/indra/newview/skins/default/textures/default_irradiance.png b/indra/newview/skins/default/textures/default_irradiance.png Binary files differnew file mode 100644 index 0000000000..899e0ddf2a --- /dev/null +++ b/indra/newview/skins/default/textures/default_irradiance.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Material.png b/indra/newview/skins/default/textures/icons/Inv_Material.png Binary files differnew file mode 100644 index 0000000000..f5918ceaed --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Material.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index aa99fe38cd..2126db32df 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -315,6 +315,7 @@ with the same filename but different name <texture name="Inv_LostClosed" file_name="icons/Inv_LostClosed.png" preload="false" /> <texture name="Inv_LostOpen" file_name="icons/Inv_LostOpen.png" preload="false" /> <texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" /> + <texture name="Inv_Material" file_name="icons/Inv_Material.png" preload="false" /> <texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" /> <texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" /> <texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" /> 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 bf97d32a5c..91a1dffcb5 100644 --- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml +++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml @@ -10,6 +10,9 @@ min_height="275" single_instance="true" 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> <layout_stack name="outer_stack" width="845" height="275" @@ -245,13 +248,33 @@ top_pad="5" width="185" can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="15" + width="180">Reflection Probe Ambiance:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="10" + name="probe_ambiance" + tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness" + top_pad="5" + width="185" + can_edit_text="true"/> <text follows="left|top" name="scene_gamma_label" height="10" layout="topleft" left_delta="-5" top_pad="15" - width="80">Scene Gamma:</text> + width="80">Brightness:</text> <slider decimal_digits="2" follows="left|top" height="16" diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index 38428b36fc..7278e55d57 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -46,14 +46,14 @@ name="GridSubUnit" top_pad="0" width="200" /> - <check_box + <!-- <check_box control_name="GridCrossSections" height="16" label="View cross-sections" layout="topleft" name="GridCrossSection" top_pad="5" - width="200" /> + width="200" />--> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 431c33a339..7aa31bed71 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -170,6 +170,20 @@ name="icon_setting" tool_tip="Environment settings" left_pad="2" /> + <check_box + control_name="BulkChangeIncludeMaterials" + height="16" + name="check_materials" + top_pad="5" + left="245" + width="16" /> + <icon + height="16" + image_name="Inv_Material" + mouse_opaque="true" + name="icon_materials" + tool_tip="Materials" + left_pad="2" /> <button height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_combobox_ok_cancel.xml b/indra/newview/skins/default/xui/en/floater_combobox_ok_cancel.xml new file mode 100644 index 0000000000..63eaffde18 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_combobox_ok_cancel.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<floater + legacy_header_height="18" + height="130" + min_height="130" + width="270" + min_width="270" + layout="topleft" + name="floater_combo" + title="floater_combo" + help_topic="floater_combo" + can_resize="false" + can_minimize="false"> + <text + follows="top|left|right" + height="10" + layout="topleft" + left="20" + name="combo_text" + top="30" + width="200"> + Select an option: + </text> + <combo_box + follows="top|left" + layout="topleft" + left="20" + name="combo_options" + top_delta="20" + width="230"/> + <button + follows="top|left" + height="23" + label="OK" + layout="topleft" + top_delta="40" + left="20" + name="combo_ok" + width="90"/> + <button + follows="top|left" + height="23" + label="Cancel" + layout="topleft" + left_pad="50" + name="combo_cancel" + width="90"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index d783d1e23c..e91efb89b2 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_minimize="false" - height="466" + height="486" layout="topleft" name="Inventory Finder" help_topic="inventory_finder" @@ -95,12 +95,29 @@ width="126" /> <icon height="16" + image_name="Inv_Material" + layout="topleft" + left="8" + mouse_opaque="true" + name="icon_material" + top="122" + width="16" /> + <check_box + height="16" + label="Materials" + layout="topleft" + left_pad="2" + name="check_material" + top_delta="0" + width="126" /> + <icon + height="16" image_name="Inv_Notecard" layout="topleft" left="8" mouse_opaque="true" name="icon_notecard" - top="122" + top="142" width="16" /> <check_box height="16" @@ -117,7 +134,7 @@ left="8" mouse_opaque="true" name="icon_object" - top="142" + top="162" width="16" /> <check_box height="16" @@ -134,7 +151,7 @@ left="8" mouse_opaque="true" name="icon_script" - top="162" + top="182" width="16" /> <check_box height="16" @@ -151,7 +168,7 @@ left="8" mouse_opaque="true" name="icon_sound" - top="182" + top="202" width="16" /> <check_box height="16" @@ -168,7 +185,7 @@ left="8" mouse_opaque="true" name="icon_texture" - top="202" + top="222" width="16" /> <check_box height="16" @@ -185,7 +202,7 @@ left="8" mouse_opaque="true" name="icon_snapshot" - top="222" + top="242" width="16" /> <check_box height="16" @@ -202,7 +219,7 @@ left="8" mouse_opaque="true" name="icon_settings" - top="242" + top="262" width="16" /> <check_box height="16" @@ -220,7 +237,7 @@ layout="topleft" left="8" name="All" - top="262" + top="282" width="100" /> <button height="20" @@ -274,7 +291,7 @@ width="260"/> <check_box height="16" - top="352" + top="372" label="Since Logoff" layout="topleft" left_delta="0" @@ -290,7 +307,7 @@ layout="topleft" left_delta="0" name="- OR -" - top="370" + top="390" width="144"> - OR - </text> @@ -298,7 +315,7 @@ height="16" layout="topleft" name="date_search_direction" - top="388" + top="408" left="8" width="270"> <radio_item @@ -368,6 +385,6 @@ layout="topleft" name="Close" right="-6" - top="434" + top="454" width="76" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml new file mode 100644 index 0000000000..5b7dab6a52 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + default_tab_group="1" + height="790" + width="256" + min_height="500" + min_width="256" + layout="topleft" + name="material editor" + help_topic="material_editor" + single_instance="true" + title="Editing Material"> + <scroll_container + name="materials_scroll" + top="18" + left="4" + height="768" + width="250" + follows="all" + layout="topleft" + color="DkGray2" + opaque="true" + tab_stop="true" + border="false" + reserve_scroll_corner="false"> + <panel + name="panel_material" + filename="panel_gltf_material.xml" + layout="topleft" + follows="left|top|right" + border="false" + top="0" + left="0" + height="768" + width="236" /> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml new file mode 100644 index 0000000000..a6a401f43e --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + default_tab_group="1" + height="891" + width="256" + min_height="500" + min_width="256" + layout="topleft" + name="material editor" + help_topic="material_editor" + title="[MATERIAL_NAME]"> + <string name="no_upload_fee_string">no upload fee</string> + <string name="upload_fee_string">L$[FEE] upload fee</string> + <string name="material_selection_title">Material selection</string> + <string name="material_selection_text">Select material:</string> + <string name="material_batch_import_text">--- Bulk Upload All ---</string> + <string name="material_override_title">Editing Material</string> + + <scroll_container + name="materials_scroll" + top="18" + left="4" + height="768" + width="250" + follows="all" + layout="topleft" + color="DkGray2" + opaque="true" + tab_stop="true" + reserve_scroll_corner="false"> + <panel + name="panel_material" + filename="panel_gltf_material.xml" + layout="topleft" + follows="left|top|right" + border="false" + top="0" + left="0" + height="768" + width="236" /> + </scroll_container> + + <panel + follows="right|bottom" + width="246" + height="97" + layout="bottomright" + top_pad="0" + left="5" + name="button_panel" + > + <text + type="string" + name="unsaved_changes" + font.style="BOLD" + text_color="DrYellow" + length="1" + follows="left|top" + height="10" + width="200" + layout="topleft" + left="10" + top="0" + > + Unsaved changes + </text> + <button + follows="left|top" + height="25" + label="Save" + enabled="false" + layout="topleft" + name="save" + top_pad="7" + left="0" + width="120" /> + <button + follows="left|top" + height="25" + label="Save As..." + enabled="false" + layout="topleft" + name="save_as" + top_delta="0" + left_pad="6" + width="120" /> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + width="220" + layout="topleft" + left="10" + top_pad="5" + name="total_upload_fee" + > + Total upload fee: L$ [FEE] + </text> + + <view_border + bevel_style="none" + height="0" + layout="topleft" + left="0" + name="button_border" + top_pad="7" + width="246"/> + + <button + follows="left|top" + height="25" + label="Cancel" + layout="topleft" + name="cancel" + top_pad="7" + left="61" + width="121" /> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 4ff25de5e2..8c9c450d7c 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -120,7 +120,7 @@ follows="all" layout="topleft" name="pnl_settings" - filter_asset_type="settings"/> + filter_asset_types="settings"/> </panel> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml index 5f0eeab71c..c8726d36b4 100644 --- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml +++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml @@ -20,6 +20,15 @@ New inventory features You can now add preview images to inventory items and view a folder in its own window. Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost] </floater.string> + <floater.string name="title_txt_gltf"> +New GLTF PBR materials support + </floater.string> + <floater.string name="description_txt_gltf"> +You can now use expanded material support with the ability to import and edit GLTF Physically Based Rendering (PBR) Materials. +In order to support the addition of the GLTF format, some areas in the viewer may appear darker than usual. + +Learn more about [https://wiki.secondlife.com/wiki/PBR_Materials Physically Based Rendering (PBR)] + </floater.string> <text type="string" length="1" @@ -37,7 +46,7 @@ New feature <text type="string" length="1" - follows="top|left|right" + follows="top|left|right|bottom" text_color="White" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml index 49dc719a24..9ca61671e1 100644 --- a/indra/newview/skins/default/xui/en/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="250" + height="266" layout="topleft" name="perms default" help_topic="perms_default" @@ -10,7 +10,7 @@ width="700"> <panel follows="left|top|right|bottom" - height="200" + height="216" label="Default Permissions" layout="topleft" left="10" @@ -549,6 +549,70 @@ left_pad="0" top_delta="0" width="100" /> + <text + name="label_14" + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="0" + tool_tip="Set default permissions for when GLTF Materials are created" + width="100"> + Materials + </text> + <icon + follows="left|top" + height="16" + image_name="Inv_Material" + layout="topleft" + left_pad="2" + width="18"/> + <check_box + control_name="MaterialsNextOwnerCopy" + height="16" + layout="topleft" + name="env_material_c" + left_pad="45" + top_delta="0" + width="100"> + <check_box.commit_callback + function="PermsDefault.Copy" + parameter="Materials" /> + </check_box> + <check_box + control_name="MaterialsNextOwnerModify" + height="16" + layout="topleft" + name="env_materials_m" + left_pad="0" + top_delta="0" + width="100" /> + <check_box + enabled_control="MaterialsNextOwnerCopy" + control_name="MaterialsNextOwnerTransfer" + height="16" + layout="topleft" + name="env_materials_t" + left_pad="0" + top_delta="0" + width="100" /> + <check_box + control_name="MaterialsShareWithGroup" + height="16" + layout="topleft" + name="env_materials_s" + left_pad="0" + top_delta="0" + width="120" /> + <check_box + control_name="MaterialsEveryoneCopy" + height="16" + layout="topleft" + name="env_materials_e" + left_pad="0" + top_delta="0" + width="100" /> </panel> <button height="20" 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 11c2d11987..bc237322af 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 @@ -273,68 +273,6 @@ Hardware </text> - <slider - control_name="TextureMemory" - decimal_digits="0" - follows="left|top" - height="16" - increment="16" - initial_value="32" - label="Texture Memory (MB):" - label_width="185" - layout="topleft" - left="30" - max_val="4096" - name="GraphicsCardTextureMemory" - tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry." - top_delta="16" - width="335" /> - - <slider - control_name="RenderFogRatio" - follows="left|top" - height="16" - initial_value="4" - decimal_digits="1" - label="Fog Distance Ratio:" - label_width="185" - layout="topleft" - left="30" - name="fog" - min_val="0.5" - max_val="10" - increment="0.1" - top_delta="16" - width="332" /> - - <slider - control_name="RenderGamma" - follows="left|top" - height="16" - initial_value="1" - decimal_digits="2" - label="Gamma:" - label_width="185" - layout="topleft" - left="30" - name="gamma" - min_val="0" - max_val="2" - increment="0.01" - top_delta="16" - width="332" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="30" - name="(brightness, lower is brighter)" - top_delta="16" - width="260"> - (0 = default brightness, lower = brighter) - </text> <check_box control_name="RenderAnisotropic" @@ -602,141 +540,6 @@ function="Pref.RenderOptionUpdate" /> </check_box> - <check_box - control_name="RenderObjectBump" - height="16" - initial_value="true" - label="Bump mapping and shiny" - layout="topleft" - left="420" - name="BumpShiny" - top_delta="16" - width="300"> - <check_box.commit_callback - function="Pref.RenderOptionUpdate" /> - </check_box> - - <check_box - control_name="RenderLocalLights" - height="16" - initial_value="true" - label="Local Lights" - layout="topleft" - left="420" - name="LocalLights" - top_delta="16" - width="300" /> - - <slider - control_name="RenderTerrainDetail" - follows="left|top" - height="16" - label="Terrain Detail:" - label_width="165" - layout="topleft" - left="440" - show_text="false" - initial_value="0" - increment="1" - min_val="0" - max_val="1" - name="TerrainDetail" - top_delta="16" - width="280" > - <slider.commit_callback - function="Pref.UpdateSliderText" - parameter="TerrainDetail" /> - </slider> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - top_delta="0" - left_delta="284" - name="TerrainDetailText" - text_readonly_color="LabelDisabledColor" - width="65"> - Low - </text> - - <check_box - control_name="RenderAvatarCloth" - height="16" - initial_value="true" - label="Avatar cloth" - layout="topleft" - left="440" - name="AvatarCloth" - top_delta="16" - width="280" /> - - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - name="ReflectionsText" - text_readonly_color="LabelDisabledColor" - top_delta="16" - left="440" - width="128"> - Water Reflections: - </text> - <combo_box - control_name="RenderReflectionDetail" - height="18" - layout="topleft" - left_delta="170" - top_delta="0" - name="Reflections" - width="150"> - <combo_box.item - label="None; opaque" - name="0" - value="-2"/> - <combo_box.item - label="None; transparent" - name="0" - value="-1"/> - <combo_box.item - label="Minimal" - name="0" - value="0"/> - <combo_box.item - label="Terrain and trees" - name="1" - value="1"/> - <combo_box.item - label="All static objects" - name="2" - value="2"/> - <combo_box.item - label="All avatars and objects" - name="3" - value="3"/> - <combo_box.item - label="Everything" - name="4" - value="4"/> - </combo_box> - - <check_box - control_name="WindLightUseAtmosShaders" - height="16" - initial_value="true" - label="Atmospheric shaders" - layout="topleft" - left="440" - name="WindLightUseAtmosShaders" - top_delta="16" - width="280"> - <check_box.commit_callback - function="Pref.RenderOptionUpdate" /> - </check_box> - <slider control_name="WLSkyDetail" decimal_digits="0" @@ -747,7 +550,7 @@ label="Sky:" label_width="145" layout="topleft" - left="460" + left="420" min_val="16" max_val="128" name="SkyMeshDetail" @@ -773,26 +576,12 @@ </text> <check_box - control_name="RenderDeferred" - height="16" - initial_value="true" - label="Advanced Lighting Model" - layout="topleft" - left="460" - name="UseLightShaders" - top_delta="16" - width="260"> - <check_box.commit_callback - function="Pref.RenderOptionUpdate" /> - </check_box> - - <check_box control_name="RenderDeferredSSAO" height="16" initial_value="true" - label="Ambient Occlusion" + label="Screen Space Ambient Occlusion" layout="topleft" - left="480" + left="420" name="UseSSAO" top_delta="16" width="240"> @@ -806,7 +595,7 @@ initial_value="true" label="Depth of Field" layout="topleft" - left="480" + left="420" name="UseDoF" top_delta="16" width="240"> @@ -814,29 +603,13 @@ function="Pref.RenderOptionUpdate" /> </check_box> - <!-- - <check_box - control_name="RenderUseAdvancedAtmospherics" - height="16" - initial_value="true" - label="Advanced Atmospherics" - layout="topleft" - left="480" - name="UseAdvancedAtmo" - top_delta="16" - width="240"> - <check_box.commit_callback - function="Pref.AdvancedAtmosphericsEnable" /> - </check_box> - --> - <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="480" + left="420" name="RenderShadowDetailText" text_readonly_color="LabelDisabledColor" top_delta="16" @@ -864,15 +637,124 @@ name="2" value="2"/> </combo_box> + + <check_box + control_name="RenderScreenSpaceReflections" + height="16" + initial_value="true" + label="Screen Space Reflections" + layout="topleft" + left="420" + name="ScreenSpaceReflections" + top_delta="16" + width="240"> + <check_box.commit_callback + function="Pref.RenderOptionUpdate" /> + </check_box> -<!-- End of Advanced Settings block --> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="420" + name="ReflectionDetailText" + text_readonly_color="LabelDisabledColor" + top_delta="16" + width="128"> + Reflection Detail: + </text> + + <combo_box + control_name="RenderReflectionProbeDetail" + height="18" + layout="topleft" + left_delta="130" + top_delta="0" + name="ReflectionDetail" + width="150"> + <combo_box.item + label="Static Only" + name="0" + value="0"/> + <combo_box.item + label="Static+Dynamic" + name="1" + value="1"/> + <combo_box.item + label="Realtime" + name="2" + value="2"/> + </combo_box> + + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="420" + name="ReflectionProbeText" + text_readonly_color="LabelDisabledColor" + top_delta="16" + width="128"> + Reflection Coverage: + </text> + + <combo_box + control_name="RenderReflectionProbeLevel" + height="18" + layout="topleft" + left_delta="130" + top_delta="0" + name="ReflectionLevel" + width="150"> + <combo_box.item + label="None" + name="0" + value="0"/> + <combo_box.item + label="Manual only" + name="1" + value="1"/> + <combo_box.item + label="Manual + terrain" + name="2" + value="2"/> + <combo_box.item + label="Full scene" + name="3" + value="3"/> + </combo_box> + + <slider + control_name="RenderExposure" + decimal_digits="1" + follows="left|top" + height="16" + increment="0.1" + initial_value="160" + label="Exposure:" + label_width="145" + layout="topleft" + left="420" + min_val="0.5" + max_val="1.5" + name="RenderExposure" + show_text="true" + top_delta="20" + width="260"> + </slider> + + <!-- End of Advanced Settings block --> <view_border bevel_style="in" height="0" layout="topleft" left="13" name="horiz_border" - top_pad="21" + top="338" top_delta="5" width="774"/> <button @@ -882,7 +764,7 @@ layout="topleft" left="20" name="Defaults" - top_delta="10" + top_delta="20" width="210"> <button.commit_callback function="Pref.HardwareDefaults" /> diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml index 3a26c3b547..8931269fe7 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -89,7 +89,7 @@ top="1" right="-4" bottom="-1" - filter_asset_type="settings" /> + filter_asset_types="settings" /> </panel> </layout_panel> <layout_panel name="pnl_combo" diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index b9ca0108b6..9ee161e611 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -133,6 +133,12 @@ label="Bound Mem" stat="glboundmemstat"/> </stat_view> + <stat_view name="material" + label="Material"> + <stat_bar name="nummaterials" + label="Count" + stat="nummaterials"/> + </stat_view> <stat_view name="memory" label="Memory Usage"> <stat_bar name="LLTrace" diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index 8081af6673..2d3321bb2f 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -19,7 +19,15 @@ </floater.string> <floater.string name="pick title"> - Pick: +Pick: + </floater.string> + <floater.string + name="pick_material"> +PICK: MATERIAL + </floater.string> + <floater.string + name="pick_texture"> +PICK: TEXTURE </floater.string> <view @@ -154,6 +162,7 @@ word_wrap="true" visible="false" width="87" /> + <filter_editor follows="left|top|right" height="23" @@ -169,22 +178,13 @@ bg_alpha_color="DkGray2" border="false" follows="all" - height="233" + height="242" layout="topleft" left_delta="0" name="inventory panel" top_pad="4" width="231" - filter_asset_type="texture"/> - <check_box - height="14" - initial_value="false" - label="Show folders" - layout="topleft" - name="show_folders_check" - top_pad="0" - left_delta="-3" - width="200" /> + filter_asset_types="texture|material"/> <!-- middle: local mode --> <button @@ -234,8 +234,8 @@ multi_select="true" search_column="1" visible="false"> + <column name="icon" label="" width="20" /> <column name="unit_name" label="Name" dynamicwidth="true" /> - <column name="unit_id_HIDDEN" label="ID" width="0" /> </scroll_list> <!-- middle: bake mode --> @@ -299,19 +299,6 @@ name="BAKED_AUX3" value="10" /> </combo_box> - <check_box - follows="left|top" - height="20" - initial_value="false" - label="Hide Base Mesh Region" - -layout="topleft" - name="hide_base_mesh_region" - left_delta="0" - top_pad="10" - top_delta="0" - width="120" - visible="false"/> <!-- bottom static --> <button follows="bottom" diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml deleted file mode 100644 index 9278a1a598..0000000000 --- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml +++ /dev/null @@ -1,440 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - can_minimize="false" - height="600" - layout="topleft" - name="TexFetchDebugger" - help_topic="texfetchdebugger" - title="Texture Fetching Debugger" - width="540"> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left="10" - name="total_num_fetched_label" - top="30" - width="400"> - 1, Total number of fetched textures: [NUM] - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_num_fetching_requests_label" - top_delta="25" - width="400"> - 2, Total number of fetching requests: [NUM] - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_num_cache_hits_label" - top_delta="25" - width="400"> - 3, Total number of cache hits: [NUM] - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_num_visible_tex_label" - top_delta="25" - width="400"> - 4, Total number of visible textures: [NUM] - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_num_visible_tex_fetch_req_label" - top_delta="25" - width="450"> - 5, Total number of visible texture fetching requests: [NUM] - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_fetched_data_label" - top_delta="25" - width="530"> - 6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_fetched_vis_data_label" - top_delta="25" - width="480"> - 7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_fetched_rendered_data_label" - top_delta="25" - width="530"> - 8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_cache_read_label" - top_delta="25" - width="400"> - 9, Total time on cache readings: [TIME] seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_cache_write_label" - top_delta="25" - width="400"> - 10, Total time on cache writings: [TIME] seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_decode_label" - top_delta="25" - width="400"> - 11, Total time on decodings: [TIME] seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_gl_label" - top_delta="25" - width="400"> - 12, Total time on gl texture creation: [TIME] seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_http_label" - top_delta="25" - width="400"> - 13, Total time on HTTP fetching: [TIME] seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_fetch_label" - top_delta="25" - width="400"> - 14, Total time on entire fetching: [TIME] seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_refetch_vis_cache_label" - top_delta="25" - width="540"> - 15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_refetch_all_cache_label" - top_delta="25" - width="540"> - 16, Refetching all textures from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_refetch_vis_http_label" - top_delta="25" - width="540"> - 17, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels - </text> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="total_time_refetch_all_http_label" - top_delta="25" - width="540"> - 18, Refetching all textures from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels - </text> - <spinner - decimal_digits="2" - follows="left|top" - height="20" - increment="0.01" - initial_value="1.0" - label="19, Ratio of Texel/Pixel:" - label_width="130" - layout="topleft" - left_delta="0" - max_val="10.0" - min_val="0.01" - name="texel_pixel_ratio" - top_delta="30" - width="200"> - <spinner.commit_callback - function="TexFetchDebugger.ChangeTexelPixelRatio" /> - </spinner> - <text - type="string" - length="1" - follows="left|top" - height="25" - layout="topleft" - left_delta="0" - name="texture_source_label" - top_delta="30" - width="110"> - 20, Texture Source: - </text> - <radio_group - control_name="TextureFetchSource" - follows="top|left" - draw_border="false" - height="25" - layout="topleft" - left_pad="0" - name="texture_source" - top_delta="0" - width="264"> - <radio_item - height="16" - label="Cache + HTTP" - layout="topleft" - left="3" - name="0" - top="0" - width="100" /> - <radio_item - height="16" - label="HTTP Only" - layout="topleft" - left_delta="100" - name="1" - top_delta="0" - width="200" /> - </radio_group> - <button - follows="left|top" - height="20" - label="Start" - layout="topleft" - left="10" - name="start_btn" - top_delta="20" - width="70"> - <button.commit_callback - function="TexFetchDebugger.Start" /> - </button> - <button - follows="left|top" - height="20" - label="Reset" - layout="topleft" - left_pad="7" - name="clear_btn" - top_delta="0" - width="70"> - <button.commit_callback - function="TexFetchDebugger.Clear" /> - </button> - <button - follows="left|top" - height="20" - label="Close" - layout="topleft" - left_pad="7" - name="close_btn" - top_delta="0" - width="70"> - <button.commit_callback - function="TexFetchDebugger.Close" /> - </button> - <button - follows="left|top" - height="22" - label="Reset Fetching Time" - layout="topleft" - left_pad="175" - name="reset_time_btn" - top_delta="0" - width="120"> - <button.commit_callback - function="TexFetchDebugger.ResetFetchTime" /> - </button> - <button - follows="left|top" - height="20" - label="Cache Read" - layout="topleft" - left="10" - name="cacheread_btn" - top_delta="20" - width="80"> - <button.commit_callback - function="TexFetchDebugger.CacheRead" /> - </button> - <button - follows="left|top" - height="20" - label="Cache Write" - layout="topleft" - left_pad="7" - name="cachewrite_btn" - top_delta="0" - width="80"> - <button.commit_callback - function="TexFetchDebugger.CacheWrite" /> - </button> - <button - follows="left|top" - height="20" - label="HTTP" - layout="topleft" - left_pad="7" - name="http_btn" - top_delta="0" - width="70"> - <button.commit_callback - function="TexFetchDebugger.HTTPLoad" /> - </button> - <button - follows="left|top" - height="20" - label="Decode" - layout="topleft" - left_pad="7" - name="decode_btn" - top_delta="0" - width="70"> - <button.commit_callback - function="TexFetchDebugger.Decode" /> - </button> - <button - follows="left|top" - height="20" - label="GL Texture" - layout="topleft" - left_pad="7" - name="gl_btn" - top_delta="0" - width="70"> - <button.commit_callback - function="TexFetchDebugger.GLTexture" /> - </button> - <button - follows="left|top" - height="20" - label="Refetch Vis Cache" - layout="topleft" - left="10" - name="refetchviscache_btn" - top_delta="20" - width="120"> - <button.commit_callback - function="TexFetchDebugger.RefetchVisCache" /> - </button> - <button - follows="left|top" - height="20" - label="Refetch All Cache" - layout="topleft" - left_pad="7" - name="refetchallcache_btn" - top_delta="0" - width="120"> - <button.commit_callback - function="TexFetchDebugger.RefetchAllCache" /> - </button> - <button - follows="left|top" - height="20" - label="Refetch Vis HTTP" - layout="topleft" - left_pad="7" - name="refetchvishttp_btn" - top_delta="0" - width="120"> - <button.commit_callback - function="TexFetchDebugger.RefetchVisHTTP" /> - </button> - <button - follows="left|top" - height="20" - label="Refetch All HTTP" - layout="topleft" - left_pad="7" - name="refetchallhttp_btn" - top_delta="0" - width="120"> - <button.commit_callback - function="TexFetchDebugger.RefetchAllHTTP" /> - </button> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 684470e0fc..9966fe0b56 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2,7 +2,7 @@ <floater positioning="cascading" legacy_header_height="18" - height="609" + height="651" layout="topleft" bg_opaque_image="Window_NoTitle_Foreground" bg_alpha_image="Window_NoTitle_Background" @@ -820,7 +820,7 @@ width="282"/> <tab_container follows="left|top" - height="426" + height="476" halign="center" left="0" name="Object Info Tabs" @@ -2534,7 +2534,70 @@ even though the user gets a free copy. mouse_opaque="true" name="Light Ambiance" width="120" /> - <text + <check_box + height="16" + label="Reflection Probe" + layout="topleft" + left="10" + name="Reflection Probe" + tool_tip="Adjusts how objects within this volume receive reflections when PBR is enabled" + top_pad="10" + width="60" /> + <combo_box + height="19" + top_delta="0" + left="144" + follows="left|top" + name="Probe Volume Type" + tool_tip="Choose the probe influence volume" + width="108"> + <combo_box.item + label="Sphere" + name="Sphere" + value="Sphere" /> + <combo_box.item + label="Box" + name="Box" + value="Box"/> + </combo_box> + <check_box + 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" /> + <spinner bottom_delta="19" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.05" + initial_value="0" + label="Ambiance" + label_width="55" + left="10" + max_val="100" + min_val="0" + mouse_opaque="true" + name="Probe Ambiance" + width="120" /> + <spinner bottom_delta="0" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.05" + initial_value="0" + label="Near Clip" + label_width="55" + left="144" + max_val="1024" + min_val="0" + mouse_opaque="true" + name="Probe Near Clip" + width="120" /> + <text type="string" length="1" follows="left|top" @@ -2689,7 +2752,7 @@ even though the user gets a free copy. border_visible="true" bevel_style="in" follows="left|top|right" - height="335" + height="387" layout="topleft" left="10" name="contents_inventory" diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index 3b91b9df7a..8e041f8de3 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -13,6 +13,14 @@ function="EnableEdit" /> </menu_item_call> <menu_item_call + label="Edit PBR material" + name="EditGLTFMaterial"> + <menu_item_call.on_click + function="Object.EditGLTFMaterial" /> + <menu_item_call.on_visible + function="Object.EnableEditGLTFMaterial"/> + </menu_item_call> + <menu_item_call enabled="false" label="Detach item" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 7016c8e558..0295ef8ccd 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -144,14 +144,6 @@ parameter="rename" /> </menu_item_call> <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 Outfit" layout="topleft" name="New Outfit"> @@ -707,6 +699,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" @@ -759,6 +979,14 @@ function="Inventory.FileUploadLocation" parameter="model" /> </menu_item_call> + <menu_item_call + label="PBR material uploads" + layout="topleft" + name="PBR uploads"> + <menu_item_call.on_click + function="Inventory.FileUploadLocation" + parameter="pbr_material" /> + </menu_item_call> </menu> <menu_item_separator 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 12ba121d3c..284dd8d9fc 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -47,13 +47,23 @@ label="Model..." layout="topleft" name="Upload Model"> - <menu_item_call.on_click - function="File.UploadModel" - parameter="" /> - <menu_item_call.on_enable - function="File.EnableUploadModel" /> - <menu_item_call.on_visible - function="File.VisibleUploadModel"/> + <menu_item_call.on_click + function="File.UploadModel" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUploadModel" /> + <menu_item_call.on_visible + function="File.VisibleUploadModel"/> + </menu_item_call> + <menu_item_call + label="Material..." + layout="topleft" + name="Upload Material"> + <menu_item_call.on_click + function="File.UploadMaterial" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUploadMaterial" /> </menu_item_call> <menu_item_call label="Bulk..." @@ -97,6 +107,16 @@ 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 height="175" label="New Clothes" diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index ce34508303..5507c9f3a1 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -22,6 +22,14 @@ function="EnableEdit"/> </menu_item_call> <menu_item_call + label="Edit PBR material" + name="EditGLTFMaterial"> + <menu_item_call.on_click + function="Object.EditGLTFMaterial" /> + <menu_item_call.on_visible + function="Object.EnableEditGLTFMaterial"/> + </menu_item_call> + <menu_item_call label="Build" name="Build"> <menu_item_call.on_click @@ -38,26 +46,25 @@ <menu_item_call.on_enable function="Object.EnableOpen" /> </menu_item_call> + <menu_item_separator layout="topleft" /> <menu_item_call - enabled="false" - label="Sit Here" + label="Sit here" name="Object Sit"> <menu_item_call.on_click function="Object.SitOrStand" /> - <menu_item_call.on_enable + <menu_item_call.on_visible function="Object.EnableSit" /> </menu_item_call> <menu_item_call - enabled="false" - label="Stand Up" + label="Stand up" name="Object Stand Up"> <menu_item_call.on_click function="Object.SitOrStand" /> - <menu_item_call.on_enable + <menu_item_call.on_visible function="Object.EnableStandUp" /> </menu_item_call> <menu_item_call - label="Object Profile" + label="Object profile" name="Object Inspect"> <menu_item_call.on_click function="Object.Inspect" /> @@ -65,13 +72,13 @@ function="Object.EnableInspect" /> </menu_item_call> <menu_item_call - label="Zoom In" + label="Zoom in" name="Zoom In"> <menu_item_call.on_click function="Object.ZoomIn" /> </menu_item_call> <menu_item_call - label="Show in linksets" + label="Show in Region Objects" name="show_in_linksets"> <menu_item_call.on_click function="Pathfinding.Linksets.Select" /> @@ -92,7 +99,7 @@ </menu_item_call> <menu_item_separator layout="topleft" /> <context_menu - label="Put On" + label="Put on" name="Put On" > <menu_item_call enabled="false" @@ -169,7 +176,7 @@ </menu_item_call> <menu_item_call enabled="false" - label="Take Copy" + label="Take copy" name="Take Copy"> <menu_item_call.on_click function="Tools.TakeCopy" /> @@ -207,7 +214,7 @@ layout="topleft" /> <menu_item_call enabled="false" - label="Block Particle Owner" + label="Block particle owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 810d3fddd5..0bfdead6e7 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -933,17 +933,27 @@ function="World.EnableEnvSettings" parameter="sunrise" /> </menu_item_check> - <menu_item_check - label="Midday" - name="Noon" - shortcut="control|shift|Y"> - <menu_item_check.on_click - function="World.EnvSettings" - parameter="noon" /> - <menu_item_check.on_check - function="World.EnableEnvSettings" - parameter="noon" /> - </menu_item_check> + <menu_item_check + label="Midday" + name="Noon" + shortcut="control|shift|Y"> + <menu_item_check.on_click + function="World.EnvSettings" + parameter="noon" /> + <menu_item_check.on_check + function="World.EnableEnvSettings" + parameter="noon" /> + </menu_item_check> + <menu_item_check + label="Midday (Legacy)" + name="legacy noon"> + <menu_item_check.on_click + function="World.EnvSettings" + parameter="legacy noon" /> + <menu_item_check.on_check + function="World.EnableEnvSettings" + parameter="legacy noon" /> + </menu_item_check> <menu_item_check label="Sunset" name="Sunset" @@ -1449,6 +1459,24 @@ function="World.EnvPreset" function="Tools.SelectOnlyMovableObjects" parameter="movable" /> </menu_item_check> + <menu_item_check + label="Select Invisible Objects" + name="Select Invisible Objects"> + <menu_item_check.on_check + control="SelectInvisibleObjects" /> + <menu_item_check.on_click + function="Tools.SelectInvisibleObjects" + parameter="invisible" /> + </menu_item_check> + <menu_item_check + label="Select Reflection Probes" + name="Select Reflection Probes"> + <menu_item_check.on_check + control="SelectReflectionProbes" /> + <menu_item_check.on_click + function="Tools.SelectReflectionProbes" + parameter="reflection_probes" /> + </menu_item_check> <menu_item_check label="Select By Surrounding" name="Select By Surrounding"> @@ -1487,6 +1515,15 @@ function="World.EnvPreset" function="Tools.ShowSelectionLightRadius" /> </menu_item_check> <menu_item_check + label="Show Reflection Probe Volumes" + name="Show Reflection Probe Volumes"> + <menu_item_check.on_check + control="RenderReflectionProbeVolumes" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderReflectionProbeVolumes" /> + </menu_item_check> + <menu_item_check label="Show Selection Beam" name="Show Selection Beam"> <menu_item_check.on_check @@ -1495,7 +1532,28 @@ function="World.EnvPreset" function="ToggleControl" parameter="ShowSelectionBeam" /> </menu_item_check> - + <menu_item_check + label="Highlight Transparent" + name="Highlight Transparent" + shortcut="control|alt|T" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="View.CheckHighlightTransparent" /> + <menu_item_check.on_click + function="View.HighlightTransparent" /> + </menu_item_check> + <menu_item_separator/> + + <menu_item_check + label="No Post" + name="No Post"> + <menu_item_check.on_check + control="RenderDisablePostProcessing" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDisablePostProcessing" /> + </menu_item_check> + <menu_item_separator/> <menu_item_check @@ -1606,6 +1664,16 @@ function="World.EnvPreset" <menu_item_call.on_visible function="File.VisibleUploadModel"/> </menu_item_call> + <menu_item_call + label="Material..." + layout="topleft" + name="Upload Material"> + <menu_item_call.on_click + function="File.UploadMaterial" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUploadMaterial" /> + </menu_item_call> <menu_item_call label="Bulk..." layout="topleft" @@ -1618,7 +1686,8 @@ function="World.EnvPreset" parameter="" /> </menu_item_call> </menu> - <menu_item_separator/> + + <menu_item_separator/> <menu_item_call enabled="false" label="Undo" @@ -1894,16 +1963,6 @@ function="World.EnvPreset" parameter="HideSelectedObjects" /> </menu_item_check> <menu_item_check - label="Highlight Transparent" - name="Highlight Transparent" - shortcut="control|alt|T" - use_mac_ctrl="true"> - <menu_item_check.on_check - function="View.CheckHighlightTransparent" /> - <menu_item_check.on_click - function="View.HighlightTransparent" /> - </menu_item_check> - <menu_item_check label="Show Mouselook Crosshairs" name="ShowCrosshairs"> <menu_item_check.on_check @@ -2049,17 +2108,6 @@ function="World.EnvPreset" parameter="water" /> </menu_item_check> <menu_item_check - label="Ground" - name="Rendering Type Ground" - shortcut="control|alt|shift|8"> - <menu_item_check.on_check - function="Advanced.CheckRenderType" - parameter="ground" /> - <menu_item_check.on_click - function="Advanced.ToggleRenderType" - parameter="ground" /> - </menu_item_check> - <menu_item_check label="Volume" name="Rendering Type Volume" shortcut="control|alt|shift|9"> @@ -2470,20 +2518,6 @@ function="World.EnvPreset" function="Advanced.ToggleConsole" parameter="scene monitor" /> </menu_item_check> - <menu_item_call - enabled="false" - visible="false" - label="Texture Fetch Debug Console" - name="Texture Fetch Debug Console"> - <menu_item_call.on_click - function="Floater.Show" - parameter="tex_fetch_debugger" /> - <on_enable - function="Develop.SetTexFetchDebugger" /> - <on_visible - function="Develop.SetTexFetchDebugger" /> - </menu_item_call> - <menu_item_separator/> <menu_item_call @@ -2762,15 +2796,6 @@ function="World.EnvPreset" function="Advanced.TogglePeriodicSlowFrame" parameter="points" /> </menu_item_check> - <menu_item_check - label="Frame Test" - name="Frame Test"> - <menu_item_check.on_check - function="Advanced.CheckFrameTest" - parameter="Frame Test" /> - <menu_item_check.on_click - function="Advanced.ToggleFrameTest" /> - </menu_item_check> <menu_item_call label="Frame Profile" name="Frame Profile"> @@ -2930,24 +2955,34 @@ function="World.EnvPreset" parameter="triangle count" /> </menu_item_check> <menu_item_check - label="Build Queue" - name="Build Queue"> + label="Lights" + name="Lights"> <menu_item_check.on_check function="Advanced.CheckInfoDisplay" - parameter="build queue" /> + parameter="lights" /> <menu_item_check.on_click function="Advanced.ToggleInfoDisplay" - parameter="build queue" /> + parameter="lights" /> </menu_item_check> <menu_item_check - label="Lights" - name="Lights"> + label="Reflection Probes" + name="Reflection Probes"> <menu_item_check.on_check function="Advanced.CheckInfoDisplay" - parameter="lights" /> + parameter="reflection probes" /> <menu_item_check.on_click function="Advanced.ToggleInfoDisplay" - parameter="lights" /> + parameter="reflection probes" /> + </menu_item_check> + <menu_item_check + label="Probe Updates" + name="Probe Updates"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="probe updates" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="probe updates" /> </menu_item_check> <menu_item_check label="Particles" @@ -3115,24 +3150,10 @@ function="World.EnvPreset" <menu_item_check.on_click function="ToggleControl" parameter="UseOcclusion" /> - <menu_item_check.on_enable - function="Advanced.EnableObjectObjectOcclusion" /> </menu_item_check> <menu_item_separator /> <menu_item_check - label="Advanced Lighting Model" - name="Advanced Lighting Model"> - <menu_item_check.on_check - function="CheckControl" - parameter="RenderDeferred" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RenderDeferred" /> - <menu_item_check.on_enable - function="Advanced.EnableRenderDeferred" /> - </menu_item_check> - <menu_item_check label=" Shadows from Sun/Moon/Projectors" name="Shadows from Sun/Moon/Projectors"> <menu_item_check.on_check @@ -3219,36 +3240,6 @@ function="World.EnvPreset" parameter="TextureDisable" /> </menu_item_check> <menu_item_check - label="Disable Ambient" - name="Disable Ambient"> - <menu_item_check.on_check - function="CheckControl" - parameter="AmbientDisable" /> - <menu_item_check.on_click - function="ToggleShaderControl" - parameter="AmbientDisable" /> - </menu_item_check> - <menu_item_check - label="Disable Sunlight" - name="Disable Sunlight"> - <menu_item_check.on_check - function="CheckControl" - parameter="SunlightDisable" /> - <menu_item_check.on_click - function="ToggleShaderControl" - parameter="SunlightDisable" /> - </menu_item_check> - <menu_item_check - label="Disable Local Lights" - name="Disable Local Lights"> - <menu_item_check.on_check - function="CheckControl" - parameter="LocalLightDisable" /> - <menu_item_check.on_click - function="ToggleShaderControl" - parameter="LocalLightDisable" /> - </menu_item_check> - <menu_item_check label="Full Res Textures" name="Rull Res Textures"> <menu_item_check.on_check @@ -3278,18 +3269,25 @@ function="World.EnvPreset" function="Advanced.HandleAttachedLightParticles" parameter="RenderAttachedParticles" /> </menu_item_check> - <menu_item_check - label="Hover Glow Objects" - name="Hover Glow Objects"> - <menu_item_check.on_check - function="CheckControl" - parameter="RenderHoverGlowEnable" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RenderHoverGlowEnable" /> - </menu_item_check> <menu_item_separator /> - + <menu_item_check + label="Enable Shader Cache" + name="Enable Shader Cache"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderShaderCacheEnabled" /> + <menu_item_check.on_click + function="ToggleShaderControl" + parameter="RenderShaderCacheEnabled" /> + </menu_item_check> + <menu_item_call + enabled="true" + label="Clear Shader Cache" + name="Shader Cache Clear"> + <menu_item_call.on_click + function="Advanced.ClearShaderCache" /> + </menu_item_call> + <menu_item_separator /> <menu_item_call enabled="true" label="Clear Cache Immediately" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 204fead7e0..d1838fc7ef 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5962,6 +5962,22 @@ You have updated the location of this pick but the other details will retain the <notification icon="alertmodal.tga" + name="ApplyInventoryToObject" + type="alertmodal"> +You are applying 'no copy' inventory item. +This item will be moved to object's inventory, not copied. + +Move the inventory item? + <tag>confirm</tag> + <usetemplate + ignoretext="Warn me before I apply 'no-copy' items to an object" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="MoveInventoryFromObject" type="alertmodal"> You have selected 'no copy' inventory items. @@ -6932,6 +6948,22 @@ You don't have permission to view this notecard. <notification icon="notifytip.tga" + name="MaterialMissing" + type="notifytip"> + Material is missing from database. + <tag>fail</tag> + </notification> + + <notification + icon="notifytip.tga" + name="MaterialNoPermissions" + type="notifytip"> + You don't have permission to view this material. + <tag>fail</tag> + </notification> + + <notification + icon="notifytip.tga" name="RezItemNoPermissions" type="notifytip"> Insufficient permissions to rez object. @@ -6962,6 +6994,26 @@ Please try again. </notification> <notification + icon="alertmodal.tga" + name="UnableToLoadMaterial" + type="alertmodal"> +Unable to load material. +Please try again. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="notifytip.tga" + name="MissingMaterialCaps" + type="notifytip"> + <tag>fail</tag> + Not connected to a materials capable region. + </notification> + + <notification icon="notifytip.tga" name="ScriptMissing" type="notifytip"> @@ -9193,7 +9245,64 @@ Unable to upload texture. [REASON] <tag>fail</tag> </notification> - + + <notification + icon="alertmodal.tga" + name="CannotUploadMaterial" + type="alertmodal"> +There was a problem uploading the file + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + label="Save Material" + name="SaveMaterialAs" + type="alertmodal"> + <unique/> + Name this material: + <tag>confirm</tag> + <form name="form"> + <input name="message" type="text"> + [DESC] + </input> + <button + default="true" + index="0" + name="OK" + text="OK"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" + name="InvalidMaterialName" + type="alertmodal"> +Please enter a non-empty name + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="UsavedMaterialChanges" + type="alertmodal"> + You have unsaved changes. + <form name="form"> + <button + index="0" + name="discard" + text="Discard changes"/> + <button + index="1" + name="keep" + text="Keep editing"/> + </form> + </notification> + <notification icon="alertmodal.tga" name="LivePreviewUnavailable" @@ -9208,6 +9317,18 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran <notification icon="alertmodal.tga" + name="LivePreviewUnavailablePBR" + type="alert"> + +We cannot display a preview of this material because it is no-copy, no-transfer, and/or no-modify. + <usetemplate + ignoretext="Warn me that Live Preview mode is not available for no-copy, no-transfer, and/or no-modify materials" + name="okignore" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="FacePasteFailed" type="alertmodal"> Paste failed. [REASON] @@ -9218,6 +9339,26 @@ Paste failed. [REASON] <notification icon="alertmodal.tga" + name="FailedToApplyTextureNoCopyToMultiple" + type="alertmodal"> +Failed to apply texture. You can not apply a no-copy texture to multiple objects. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="FailedToApplyGLTFNoCopyToMultiple" + type="alertmodal"> +Failed to apply GLTF material. You can not apply a no-copy material to multiple objects. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="FacePasteTexturePermissions" type="alertmodal"> You applied a texture with limited permissions, object will inherit permissions from texture. @@ -9890,6 +10031,15 @@ Attempt cancelled. <notification icon="alertmodal.tga" + name="LocalGLTFVerifyFail" + persist="true" + type="notify"> +Attempted to add an invalid or unreadable GLTF material [FNAME] which could not be opened or decoded. +Attempt cancelled. + </notification> + + <notification + icon="alertmodal.tga" name="PathfindingReturnMultipleItems" type="alertmodal"> You are returning [NUM_ITEMS] items. Are you sure you want to continue? @@ -12099,4 +12249,28 @@ Would you like to save them first? yestext="Yes"/> </notification> + <notification + icon="notifytip.tga" + name="ReflectionProbeApplied" + persist="true" + type="alertmodal"> + WARNING: You have made your object a Reflection Probe. This will implicitly change the object to mimic its influence volume and will make irreversible changes to the object. Do you want to continue? + <usetemplate + ignoretext="Reflection Probe tips" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="notifytip.tga" + name="AutoAdjustHDRSky" + type="alertmodal"> + You are editing a non-HDR sky that has been automatically converted to HDR. To remove HDR and tone mapping, set Reflection Probe Ambiance to zero. + <usetemplate + ignoretext="HDR Sky adjustment warning" + name="okignore" + yestext="OK"/> + </notification> + </notifications> diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml new file mode 100644 index 0000000000..45df40bc05 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml @@ -0,0 +1,392 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + layout="topleft" + follows="left|top|right" + border="false" + name="panel_gltf_material" + top="0" + left="0" + height="768" + width="247"> + <check_box + follows="left|top" + layout="topleft" + label="Double Sided" + left="10" + top="0" + name="double sided" + height="25" + width="120" /> + <panel + border="true" + follows="left|top" + width="246" + height="196" + layout="topleft" + left="1" + mouse_opaque="false" + name="base_color_texture_pnl" + top_pad="5" + > + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + top="5" + width="128" + name="base_color_lbl"> + Base Color: + </text> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + allow_no_texture="true" + follows="left|top" + top_pad="8" + height="151" + layout="topleft" + left="10" + name="base_color_texture" + tool_tip="Base Color map. Alpha channel is optional and used for transparency." + width="128" /> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + width="128" + layout="topleft" + left="10" + top_pad="-17" + name="base_color_upload_fee"> + No upload fee + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + top="8" + name="base_color_tint_lbl"> + Tint + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="40" + label_height="0" + layout="topleft" + left_delta="0" + top_pad="5" + name="base color" + width="40" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="5" + width="96" + name="base_color_transparency_lbl"> + Alpha + </text> + <spinner + decimal_digits="3" + follows="left|top" + height="19" + increment="0.01" + initial_value="1" + layout="topleft" + left_delta="0" + top_pad="5" + min_val="0" + max_val="1" + name="transparency" + width="64"/> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + text_readonly_color="LabelDisabledColor" + top_pad="5" + width="90" + name="alpha_mode_lbl"> + Alpha mode + </text> + <combo_box + height="23" + layout="topleft" + left_delta="0" + name="alpha mode" + top_pad="4" + width="89"> + <combo_box.item + label="Opaque" + name="None" + value="OPAQUE" /> + <combo_box.item + label="Blend" + name="Alpha blending" + value="BLEND" /> + <combo_box.item + label="Mask" + name="Alpha masking" + value="MASK" /> + </combo_box> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="5" + width="96" + name="alpha_cutoff_lbl"> + Alpha Cutoff + </text> + <spinner + decimal_digits="3" + follows="left|top" + height="19" + increment="0.01" + initial_value="1" + layout="topleft" + left_delta="0" + top_pad="5" + min_val="0" + max_val="1" + name="alpha cutoff" + width="64"/> + </panel> + <panel + border="true" + follows="left|top" + width="246" + height="175" + layout="topleft" + left="1" + mouse_opaque="false" + name="metallic_texture_pnl" + top_pad="5"> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + top="5" + name="metallic_roughness_lbl"> + Metallic-Roughness: + </text> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + allow_no_texture="true" + follows="left|top" + width="128" + height="151" + layout="topleft" + left="10" + name="metallic_roughness_texture" + tool_tip="GLTF metallic-roughness map with optional occlusion. Red channel is occlusion, green channel is roughness, blue channel is metalness." + top_pad="8"/> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + width="128" + layout="topleft" + left="10" + top_pad="-17" + name="metallic_upload_fee"> + No upload fee + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + top="8" + name="metallic_factor_lbl"> + Metallic Factor + </text> + <spinner + decimal_digits="3" + follows="left|top" + height="19" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + top_pad="5" + min_val="0" + max_val="1" + name="metalness factor" + width="64"/> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="5" + width="96" + name="roughness_factor_lbl"> + Roughness Factor + </text> + <spinner + decimal_digits="3" + follows="left|top" + height="19" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + top_pad="5" + min_val="0" + max_val="1" + name="roughness factor" + width="64"/> + </panel> + <panel + border="true" + follows="left|top" + width="246" + height="175" + layout="topleft" + left="1" + mouse_opaque="false" + name="emissive_texture_pnl" + top_pad="5"> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + top="5" + width="64" + name="emissive_lbl"> + Emissive: + </text> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + allow_no_texture="true" + follows="left|top" + top_pad="8" + height="151" + layout="topleft" + left="10" + name="emissive_texture" + width="128" /> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + width="128" + layout="topleft" + left="10" + top_pad="-17" + name="emissive_upload_fee"> + No upload fee + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + top="8" + name="emissive_tint_lbl"> + Tint + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="40" + label_height="0" + layout="topleft" + left_delta="0" + top_pad="5" + name="emissive color" + width="40" /> + </panel> + <panel + border="true" + follows="left|top" + width="246" + height="175" + layout="topleft" + left="1" + mouse_opaque="false" + top_pad="5" + name="normal_texture_pnl"> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + top="5" + width="64" + name="normal_lbl"> + Normal: + </text> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + allow_no_texture="true" + follows="left|top" + top_pad="8" + height="151" + layout="topleft" + left="10" + name="normal_texture" + width="128" /> + <text + type="string" + font.style="BOLD" + length="1" + follows="left|top" + height="10" + width="128" + layout="topleft" + left="10" + top_pad="-17" + name="normal_upload_fee"> + No upload fee + </text> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml index b52c19d5e3..83db17b679 100644 --- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml +++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml @@ -273,7 +273,7 @@ left="20" name="environment_lbl" width="100"> - Environment + Shadows </text> <text follows="left|top" @@ -285,29 +285,8 @@ left="160" name="enhancements_desc" width="350"> - Each enhancement improves realism but can reduce speed. + Shadows significantly improve visual quality but can reduce speed. </text> - <check_box - control_name="WindLightUseAtmosShaders" - height="16" - initial_value="true" - label="Atmospheric shaders" - layout="topleft" - name="atmospheric_shaders" - top_pad="5" - left="157" - width="280"> - </check_box> - <check_box - control_name="RenderDeferred" - height="16" - initial_value="true" - label="Advanced Lighting" - layout="topleft" - name="advanced_lighting_model" - top_delta="24" - width="280"> - </check_box> <text type="string" length="1" @@ -319,7 +298,7 @@ text_readonly_color="LabelDisabledColor" top_pad="10" width="128"> - Shadows: + Shadow Detail: </text> <combo_box control_name="RenderShadowDetail" @@ -372,7 +351,7 @@ left="160" name="water_desc" width="380"> - Reducing or turning off water effects can greatly improve frame rate. + Reducing or turning off transparent water may improve frame rate. </text> <check_box control_name="RenderTransparentWater" @@ -385,56 +364,6 @@ left="157" width="280"> </check_box> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - name="ReflectionsText" - text_readonly_color="LabelDisabledColor" - top_pad="16" - left="160" - width="128"> - Water Reflections: - </text> - <combo_box - control_name="RenderReflectionDetail" - height="18" - layout="topleft" - left_delta="150" - top_delta="0" - name="Reflections" - width="150"> - <combo_box.item - label="None; opaque" - name="0" - value="-2"/> - <combo_box.item - label="None; transparent" - name="0" - value="-1"/> - <combo_box.item - label="Minimal" - name="0" - value="0"/> - <combo_box.item - label="Terrain and trees" - name="1" - value="1"/> - <combo_box.item - label="All static objects" - name="2" - value="2"/> - <combo_box.item - label="All avatars and objects" - name="3" - value="3"/> - <combo_box.item - label="Everything" - name="4" - value="4"/> - </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 ad02df3087..fe74cea2f1 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -231,34 +231,6 @@ m </text> - <check_box - control_name="WindLightUseAtmosShaders" - height="16" - initial_value="true" - label="Atmospheric shaders" - layout="topleft" - left="30" - name="WindLightUseAtmosShaders" - top_delta="24" - width="280"> - <check_box.commit_callback - function="Pref.RenderOptionUpdate" /> - </check_box> - - <check_box - control_name="RenderDeferred" - height="16" - initial_value="true" - label="Advanced Lighting Model" - layout="topleft" - left="30" - name="UseLightShaders" - top_delta="24" - width="256"> - <check_box.commit_callback - function="Pref.RenderOptionUpdate" /> - </check_box> - <button height="23" label="Automatic adjustments settings" @@ -343,6 +315,25 @@ width="120"> function="Pref.RenderExceptions"/> </button> + <slider + control_name="RenderExposure" + decimal_digits="1" + follows="left|top" + height="16" + increment="0.1" + initial_value="160" + label="Brightness (exposure)" + label_width="145" + layout="topleft" + left="30" + min_val="0.5" + max_val="1.5" + name="RenderExposure" + show_text="true" + top_pad="14" + width="260"> + </slider> + <!-- End of Basic Settings block --> <button diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml index 67eff2b762..08ff3d4d53 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml @@ -126,6 +126,31 @@ type="string" length="1" follows="left|top" + height="12" + layout="topleft" + left="37" + name="title_pbr" + top_pad="7" + width="100"> + PBR Materials + </text> + <text + type="string" + use_ellipses="true" + follows="left|top" + height="27" + layout="topleft" + font.style="BOLD" + left="37" + name="upload_pbr" + top_pad="5" + width="370" + word_wrap="true"/> + + <text + type="string" + length="1" + follows="left|top" height="30" layout="topleft" font.style="ITALIC" 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 fa2d4dfe73..da82c95c83 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 @@ -7,6 +7,9 @@ left="0" name="panel_settings_sky_atmos" 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> <layout_stack name="main_ls" follows="all" @@ -228,29 +231,6 @@ name="ice_level" width="207" can_edit_text="true"/> - <text - name="scene_gamma_label" - follows="left|top" - height="10" - layout="topleft" - left_delta="-5" - top_delta="25" - width="80"> - Scene Gamma: - </text> - <slider - decimal_digits="2" - follows="left|top" - height="16" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="5" - max_val="20" - name="scene_gamma" - top_delta="20" - width="207" - can_edit_text="true"/> </layout_panel> <layout_panel name="right_lp" @@ -332,6 +312,54 @@ top_delta="20" width="219" can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + tooltip="Irradiance control. When not zero, enables HDR lighting model." + width="200"> + Reflection Probe Ambiance (HDR): + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="10" + name="probe_ambiance" + tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness" + top_delta="20" + width="219" + can_edit_text="true"/> + <text + name="scene_gamma_label" + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Brightness: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + max_val="20" + name="scene_gamma" + top_delta="20" + width="207" + can_edit_text="true"/> </layout_panel> </layout_stack> </layout_panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index 1aa42af3a8..f19629df26 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -72,8 +72,8 @@ initial_value="0" layout="top" left_delta="15" - min_val="-10" - max_val="10" + min_val="0.001" + max_val="100" name="water_fog_density" top_delta="5" width="150" diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index c7052bb737..fe01996623 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -2,7 +2,7 @@ <panel border="false" follows="all" - height="420" + height="500" label="Texture" layout="topleft" left="0" @@ -132,28 +132,43 @@ name="object_horizontal" top_pad="4" width="278" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="12" + top_pad="12" + name="label_matmedia" + width="90"> + Material + </text> <combo_box height="23" layout="topleft" left="10" name="combobox matmedia" - top_pad="17" + top_pad="5" width="90"> <combo_box.item - label="Materials" + label="Textures" name="Materials" value="Materials" /> <combo_box.item + label="PBR Metallic Roughness" + name="PBR" + value="PBR" /> + <combo_box.item label="Media" name="Media" value="Media" /> </combo_box> <radio_group - control_name="ComboMaterialType" - height="50" + height="84" layout="topleft" left_pad="5" - top_delta="-10" + top_delta="-20" width="150" visible = "false" name="radio_material_type"> @@ -179,6 +194,50 @@ top_pad="1" value="2"/> </radio_group> + <radio_group + height="84" + layout="topleft" + left_delta="0" + top_delta="0" + width="150" + visible = "false" + name="radio_pbr_type"> + <radio_item + label="Complete material" + name="Complete material" + top="0" + layout="topleft" + height="16" + value="0"/> + <radio_item + label="Base color" + name="Base color" + layout="topleft" + top_pad="1" + height="16" + value="1"/> + <radio_item + label="Metallic/roughness" + name="Metallic/roughness" + height="16" + layout="topleft" + top_pad="1" + value="2"/> + <radio_item + label="Emissive" + name="Emissive" + layout="topleft" + top_pad="1" + height="16" + value="3"/> + <radio_item + label="Normal" + layout="topleft" + top_pad="1" + height="16" + name="Normal" + value="4"/> + </radio_group> <menu_button menu_filename="menu_copy_paste_texture.xml" follows="top|left" @@ -195,7 +254,7 @@ <check_box control_name="SyncMaterialSettings" follows="top|left" - height="20" + height="47" initial_value="false" label="Lock repeat" layout="topleft" @@ -206,6 +265,59 @@ width="160" /> <texture_picker can_apply_immediately="true" + allow_no_texture="true" + follows="left|top" + height="80" + label="Material" + layout="topleft" + left="10" + name="pbr_control" + tool_tip="Click to choose a pbr material" + top_pad="5" + width="64" /> + <button + follows="left|top" + height="23" + layout="topleft" + left_pad="10" + top_delta="0" + name="pbr_from_inventory" + label="Choose from inventory" + width="140"/> + <text + visible="false" + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + top_pad="4" + left_delta="0" + name="material_permissions_loading_label" + text_readonly_color="LabelDisabledColor" + width="160"> + Loading contents... + </text> + <button + follows="left|top" + height="23" + layout="topleft" + left_delta="0" + top_delta="0" + name="edit_selected_pbr" + label="Edit Selected" + width="140"/> + <button + follows="left|top" + height="23" + layout="topleft" + left_delta="0" + top_pad="4" + name="save_selected_pbr" + label="Save to inventory" + width="140"/> + <texture_picker + can_apply_immediately="true" default_image_name="Default" fallback_image="materials_ui_x_24.png" follows="left|top" @@ -215,7 +327,7 @@ left="10" name="texture control" tool_tip="Click to choose a picture" - top_pad="5" + top_delta="-54" width="64" /> <text type="string" @@ -814,13 +926,13 @@ left="7" name="checkbox planar align" tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." - top_delta="16" + top_delta="20" width="260" /> <button - follows="left|top" - layout="topleft" + follows="left|top" + layout="topleft" left="9" - top="204" + top="231" height="20" label="Align" label_selected="Align current texture layers" @@ -839,4 +951,67 @@ height="4" start_url="about:blank" decouple_texture_size="true" /> - </panel> + <!-- BEGIN PBR Material texture transform parameters --> + <spinner + follows="left|top" + height="19" + initial_value="1" + label="Scale u" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="gltfTextureScaleU" + top_delta="34" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="1" + label="Scale v" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="gltfTextureScaleV" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Rotation" + label_width="205" + layout="topleft" + left="10" + min_val="-360" + max_val="360" + name="gltfTextureRotation" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Offset u" + label_width="205" + layout="topleft" + left="10" + min_val="-999" + max_val="999" + name="gltfTextureOffsetU" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Offset v" + label_width="205" + layout="topleft" + left="10" + min_val="-999" + max_val="999" + name="gltfTextureOffsetV" + width="265" /> + <!-- END PBR Material texture transform parameters --> +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 844af62905..5d33853adc 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -319,6 +319,11 @@ Only items with unrestricted 'next owner' permissions can be attached to notecards. </string> + <string name="TooltipTextureRestrictedDrop"> +Only textures with unrestricted +copy and transfer permissions +are allowed. + </string> <!-- searching - generic --> <string name="Searching">Searching...</string> @@ -403,6 +408,7 @@ http://secondlife.com/support for help fixing this problem. <string name="symbolic link">link</string> <string name="symbolic folder link">folder link</string> <string name="settings blob">settings</string> + <string name="render material">material</string> <string name="mesh">mesh</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> @@ -2433,6 +2439,7 @@ If you continue to receive this message, please contact Second Life support for <string name="Clothing" value=" Clothing," /> <string name="Gestures" value=" Gestures," /> <string name="Landmarks" value=" Landmarks," /> + <string name="Materials" value=" Materials," /> <string name="Notecards" value=" Notecards," /> <string name="Objects" value=" Objects," /> <string name="Scripts" value=" Scripts," /> @@ -2478,6 +2485,9 @@ If you continue to receive this message, please contact Second Life support for <string name="InvFolder Meshes">Meshes</string> <string name="InvFolder Received Items">Received Items</string> <string name="InvFolder Merchant Outbox">Merchant Outbox</string> + <string name="InvFolder Settings">Settings</string> + <string name="InvFolder Material">Materials</string> + <string name="InvFolder Materials">Materials</string> <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694--> <string name="InvFolder Friends">Friends</string> @@ -3002,16 +3012,6 @@ Running in window. <string name="MBDevContextErr">Can't make GL device context</string> <string name="MBPixelFmtErr">Can't find suitable pixel format</string> <string name="MBPixelFmtDescErr">Can't get pixel format description</string> - <string name="MBTrueColorWindow"> - [APP_NAME] requires True Color (32-bit) to run. -Please go to your computer's display settings and set the color mode to 32-bit. - </string> - <string name="MBAlpha"> - [APP_NAME] is unable to run because it can't get an 8 bit alpha channel. Usually this is due to video card driver issues. -Please make sure you have the latest video card drivers installed. -Also be sure your monitor is set to True Color (32-bit) in Control Panels > Display > Settings. -If you continue to receive this message, contact the [SUPPORT_SITE]. - </string> <string name="MBPixelFmtSetErr">Can't set pixel format</string> <string name="MBGLContextErr">Can't create GL rendering context</string> <string name="MBGLContextActErr">Can't activate GL rendering context</string> @@ -3858,6 +3858,7 @@ Abuse Report</string> <string name="New Physics">New Physics</string> <string name="Invalid Wearable">Invalid Wearable</string> <string name="New Gesture">New Gesture</string> + <string name="New Material">New Material</string> <string name="New Script">New Script</string> <string name="New Note">New Note</string> <string name="New Folder">New Folder</string> @@ -4280,6 +4281,9 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string> <string name="ExperiencePermissionShort16">Sit</string> <string name="ExperiencePermissionShort17">Environment</string> + <!-- PBR Materials --> + <string name="Material Texture Name Header">Textures present this material: </string> + <!-- Conversation log messages --> <string name="logging_calls_disabled_log_empty"> Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat. |
