diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
| commit | 94afae5b1552439f69126ecf7cd6716fa692fed6 (patch) | |
| tree | 52abb39e749f4c2e2835e89ff3afd39034d34fba /indra/newview/skins | |
| parent | 29e344bbd0043bb1cd5f1defd6f9a193b0cc728e (diff) | |
| parent | 4cb5439e425dbfd354a27cbfbfe071904d068d5d (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/skins')
| -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" |