2 files changed, 30 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 0abee2ff80..44bdcd86f9 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="600"
+ height="640"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -820,7 +820,7 @@
     width="282"/>
     <tab_container
      follows="left|top"
-     height="410"
+     height="460"
      halign="center"
      left="0"
      name="Object Info Tabs"
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 90f32ae452..85ee736176 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -2,7 +2,7 @@
 <panel
          border="false"
          follows="all"
-         height="420"
+         height="500"
          label="Texture"
          layout="topleft"
          left="0"
@@ -772,7 +772,7 @@
              width="260" />
 			<button
 			 left="10"
-			 top="222"
+			 top="257"
 			 height="20"
 			 label="Align"
 			 label_selected="Align current texture layers"
@@ -793,4 +793,29 @@
              height="4"
              start_url="about:blank"
              decouple_texture_size="true" />
-	   </panel>
+      <button
+       left="90"
+       top="222"
+       height="20"
+       label="Save as Material"
+       label_selected="Save current face as a Material"
+       layout="topleft"
+       name="button save material"
+       top_delta="0"
+       tool_tip="Save material to inventory"
+       width="110" />
+
+            <line_editor
+             enabled="true"
+             follows="top|left"
+             height="16"
+             layout="topleft"
+             left="7"
+             label="Material UUID"
+             name="materialID"
+             select_on_focus="true"
+             top="380"
+             width="200"
+             tool_tip="UUID for a material asset"
+             />
+</panel>