diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 23:39:36 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-01 13:26:11 +0300 |
| commit | 116bd660b65cfad64c6f9635db165cff5b3eda36 (patch) | |
| tree | 94a337b1768987305c426f079a6841179427c57f /indra/newview/skins/default | |
| parent | 20dc30450cb50d08e6c7d23613a6a59aae1a6a16 (diff) | |
SL-17653 Finalized texure picker's local filtering
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 118 |
1 files changed, 73 insertions, 45 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 2a84fece03..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,51 +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="200" - layout="topleft" - left_delta="0" - name="inventory panel" - top_pad="4" - width="231" - filter_asset_types="texture|material"/> + 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 |