diff options
| author | Callum Prentice <callum@lindenlab.com> | 2022-08-19 14:51:03 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2022-08-19 14:51:03 -0700 |
| commit | 15cd6c1cb757060754680bec6101df7c0675cb38 (patch) | |
| tree | b06a7911be74e881c5e0ce292220df18dc37972a /indra/newview/skins | |
| parent | 664ba53e4ce8510345e490cedf4401f6655f38fc (diff) | |
| parent | 59884327e29133afad7bb87852c83691f175922d (diff) | |
Merge branch 'DRTVWR-559-SL-17699' into DRTVWR-559
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 32 |
1 files changed, 27 insertions, 5 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 1e42b97025..5ab31b404e 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -137,7 +137,29 @@ value="Preview Disabled" word_wrap="true" visible="false" - width="87" /> + 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" @@ -145,15 +167,15 @@ layout="topleft" left="175" name="inventory search editor" - top="20" + top="48" width="231" /> - <asset_filtered_inv_panel - allow_multi_select="false" + <asset_filtered_inv_panel + allow_multi_select="false" bg_visible="true" bg_alpha_color="DkGray2" border="false" follows="all" - height="233" + height="195" layout="topleft" left_delta="0" name="inventory panel" |