diff options
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 127 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 48 |
2 files changed, 121 insertions, 54 deletions
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 18c226ed58..b6a2aaf31b 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -137,60 +137,79 @@ value="Preview Disabled" word_wrap="true" visible="false" - width="87" /> - <combo_box - follows="left|top|right" - height="23" - label="Choose Textures, Materials or LIFE!" - layout="topleft" - left="175" - name="textures_material_combo" - top="20" - width="231"> - <combo_box.item - label="Materials & Textures" - name="Materials_Textures" - value="0" /> - <combo_box.item - label="Textures" - name="Textures" - value="1" /> - <combo_box.item - label="Materials" - name="Materials" - value="2" /> - </combo_box> - <filter_editor - follows="left|top|right" - height="23" - label="Filter Textures" - layout="topleft" - left="175" - name="inventory search editor" - top="48" - width="231" /> - <asset_filtered_inv_panel - allow_multi_select="false" - bg_visible="true" - bg_alpha_color="DkGray2" - border="false" - follows="all" - height="195" - layout="topleft" - left_delta="0" - name="inventory panel" - top_pad="4" - width="231" - filter_asset_types="texture|material"/> - <check_box - height="14" - initial_value="false" - label="Show folders" - layout="topleft" - name="show_folders_check" - top_pad="0" - left_delta="-3" - width="200" /> + width="87" /> + + <layout_stack name="inventory_stack" + width="231" + height="276" + top="20" + left="175" + follows="all" + animate="false" + orientation="vertical"> + <layout_panel name="combo_layout" + border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + visible="false" + width="231" + height="24"> + <combo_box + follows="left|top|right" + height="23" + label="Choose Textures, Materials or LIFE!" + layout="topleft" + left="0" + name="textures_material_combo" + top="0" + width="231"> + <combo_box.item + label="Materials & Textures" + name="Materials_Textures" + value="0" /> + <combo_box.item + label="Textures" + name="Textures" + value="1" /> + <combo_box.item + label="Materials" + name="Materials" + value="2" /> + </combo_box> + </layout_panel> + <layout_panel name="inventory_layout" + border="false" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + width="231" + height="252"> + <filter_editor + follows="left|top|right" + height="23" + label="Filter Textures" + layout="topleft" + left="0" + name="inventory search editor" + top="4" + width="231" /> + <asset_filtered_inv_panel + allow_multi_select="false" + bg_visible="true" + bg_alpha_color="DkGray2" + border="false" + follows="all" + height="221" + layout="topleft" + left_delta="0" + name="inventory panel" + top_pad="4" + width="231" + filter_asset_types="texture|material"/> + </layout_panel> + </layout_stack> <!-- middle: local mode --> <button 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 2af7ccaa7a..922c58fa94 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -144,6 +144,10 @@ name="Materials" value="Materials" /> <combo_box.item + label="PBR" + name="PBR" + value="PBR" /> + <combo_box.item label="Media" name="Media" value="Media" /> @@ -179,6 +183,37 @@ top_pad="1" value="2"/> </radio_group> + <radio_group + control_name="ComboMaterialType" + height="50" + layout="topleft" + left_delta="0" + top_delta="0" + width="150" + visible = "false" + name="radio_pbr_type"> + <radio_item + label="Albedo/emissive" + name="Albedo/emissive" + top="0" + layout="topleft" + height="16" + value="0"/> + <radio_item + label="Normal" + layout="topleft" + top_pad="1" + height="16" + name="Normal" + value="1"/> + <radio_item + label="Metallic/roughness" + name="Metallic/roughness" + height="16" + layout="topleft" + top_pad="1" + value="2"/> + </radio_group> <menu_button menu_filename="menu_copy_paste_texture.xml" follows="top|left" @@ -217,6 +252,19 @@ tool_tip="Click to choose a picture" top_pad="5" width="64" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + follows="left|top" + height="80" + label="PBR " + layout="topleft" + left="10" + name="pbr_control" + tool_tip="Click to choose a pbr material" + top_delta="0" + width="64" /> <text type="string" length="1" |