diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-29 01:27:35 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-29 02:52:56 +0300 |
| commit | b6a35e36d71b421e8f74e5b5e3f0909c8fcda930 (patch) | |
| tree | 570f1dd6a532863e0e5f9e5cfe2e3815459d5cfa /indra/newview/skins/default | |
| parent | 105f50478c84b0c14243da3d49479c65ec6ee040 (diff) | |
SL-18448 Material Editor and Tools floater adjustments
1. Enable glow
2. Added buttons to texture->pbr
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 38 |
1 files changed, 28 insertions, 10 deletions
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 ff2323784c..e2d571324f 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -239,28 +239,46 @@ width="160" /> <texture_picker can_apply_immediately="true" - default_image_name="Default" - fallback_image="materials_ui_x_24.png" + allow_no_texture="true" follows="left|top" height="80" - label="Texture " + label="PBR " layout="topleft" left="10" - name="texture control" - tool_tip="Click to choose a picture" + 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"/> + <button + follows="left|top" + height="23" + layout="topleft" + left_delta="0" + top_pad="4" + name="edit_selected_pbr" + label="Edit Selected" + width="140"/> <texture_picker can_apply_immediately="true" - allow_no_texture="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" follows="left|top" height="80" - label="PBR " + label="Texture " layout="topleft" left="10" - name="pbr_control" - tool_tip="Click to choose a pbr material" - top_delta="0" + name="texture control" + tool_tip="Click to choose a picture" + top_delta="-27" width="64" /> <text type="string" |