From dc8365ff00c5ae33f31d779efa23f7872ec368a7 Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 9 Dec 2009 16:27:39 -0500
Subject: Fix for EXT-2703 & EXT-2708 - save texture as issues Added save as to
 texture preview floater.  Fixed behavior of save as (was only working for
 textures, not snapshots). Removed advanced menu entry for save texture as
 (refused to work after multiple implementations).

---
 indra/newview/skins/default/xui/en/floater_preview_texture.xml | 9 +++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml             | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 52a19ac6b3..054f3be70a 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -60,6 +60,15 @@
      left_pad="5"
      name="Discard"
      top_delta="0"
+     width="100" />
+	 <button
+     follows="left|bottom"
+     height="22"
+     label="Save As"
+     layout="topleft"
+     left_pad="5"
+     name="save_tex_btn"
+     top_delta="0"
      width="100" />
      <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ae8a1599a9..07e509d993 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1189,15 +1189,6 @@
              function="ToggleControl"
              parameter="CompressSnapshotsToDisk" />
         </menu_item_check>
-        <menu_item_call
-         label="Save Texture As"
-         layout="topleft"
-         name="Save Texture As">
-            <menu_item_call.on_click
-             function="File.SaveTexture" />
-            <menu_item_call.on_enable
-             function="File.EnableSaveAs" />
-        </menu_item_call>
         <menu_item_separator
          layout="topleft" />
         <menu
-- 
cgit v1.2.3


From 272bb744af3dd942369f4c378db316e182a1ab87 Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 9 Dec 2009 20:24:37 -0500
Subject: Fix for save texture functionality no longer respecting permissions

---
 indra/newview/skins/default/xui/en/floater_preview_texture.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 054f3be70a..602a18ea56 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -61,7 +61,7 @@
      name="Discard"
      top_delta="0"
      width="100" />
-	 <button
+    <button
      follows="left|bottom"
      height="22"
      label="Save As"
@@ -70,7 +70,7 @@
      name="save_tex_btn"
      top_delta="0"
      width="100" />
-     <text
+    <text
      type="string"
      length="1"
      follows="left|bottom"
-- 
cgit v1.2.3