From 39905b927d60e204438705728d2c214cb3f9ef81 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 2 Jul 2009 00:38:13 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873
 https://svn.aws.productengine.com/secondlife/pe/stable@888 ->
 viewer-2.0.0-pe-4

---
 .../skins/default/xui/en/panel_edit_pick.xml       | 31 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_pick.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 967cf2f539..acbbde37c9 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -9,7 +9,7 @@
  left="0"
  name="panel_edit_pick"
  top="0"
- width="355">
+ width="345">
     <text
      type="string"
      length="1"
@@ -33,14 +33,33 @@
      left="10"
      right="-10"
      top="30">
-        <texture_picker
+        <panel
          follows="left|top|right"
          height="150"
          layout="topleft"
          left="10"
-         name="pick_snapshot"
          right="-10"
-         top="10" />
+         top="10">
+            <panel
+             follows="left|top|right"
+             height="150"
+             layout="topleft" >
+                <texture_picker
+                 follows="left|top|right"
+                 height="150"
+                 layout="topleft"
+                 name="pick_snapshot" />
+            </panel>
+            <icon
+             height="16"
+             image_name="image_edit_icon.tga"
+             layout="topleft"
+             name="edit_icon"
+             right="-25"
+             top="30"
+             visible="false"
+             width="16" />
+        </panel>
         <text
          type="string"
          length="1"
@@ -124,11 +143,11 @@
      left="5"
      name="bottom_panel"
      top="605"
-     width="345">
+	   right="-10">
         <button
          follows="bottom|left"
          height="20"
-         label="Save Changes"
+         label="Save [WHAT]"
          layout="topleft"
          name="save_changes_btn"
          right="-120"
-- 
cgit v1.2.3