From b6a35e36d71b421e8f74e5b5e3f0909c8fcda930 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 29 Oct 2022 01:27:35 +0300
Subject: SL-18448 Material Editor and Tools floater adjustments

1. Enable glow
2. Added buttons to texture->pbr
---
 .../skins/default/xui/en/panel_tools_texture.xml   | 38 ++++++++++++++++------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins')

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"
-- 
cgit v1.2.3