From 8b3f4ec5f58c1488ac7b3403a1a510a4977cebf6 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Thu, 5 May 2016 19:43:02 +0300
Subject: MAINT-6226 Incorporate a customized Snapshot feature to Outfit
 Browser flow Removed odd controls like custom resolution spinners etc

---
 .../default/xui/en/floater_outfit_snapshot.xml     | 63 ----------------------
 .../xui/en/panel_outfit_snapshot_inventory.xml     | 52 ++----------------
 2 files changed, 3 insertions(+), 112 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
index 7b88b07ca6..34f02e535f 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
@@ -156,23 +156,6 @@
          width="100">
             Capture:
         </text>
-        <combo_box
-         follows="left|top|right"
-         height="23"
-         label="Image Layers"
-         layout="topleft"
-         left="30"
-         name="layer_types"
-         right="-2">
-            <combo_box.item
-             label="Colors"
-             name="Colors"
-             value="colors" />
-            <combo_box.item
-             label="Depth"
-             name="Depth"
-             value="depth" />
-        </combo_box>
         <check_box
          label="Interface"
          layout="topleft"
@@ -243,43 +226,6 @@
          top_pad="7"
          />
     </panel>
- <!--
-	<panel_container
-     follows="left|top"
-     height="230"
-     layout="topleft"
-     left="0"
-     name="panel_container"
-     default_panel_name="panel_snapshot_options"
-     top_pad="10"
-     width="215">
-      <panel
-       class="llpanelsnapshotoptions"
-       filename="panel_snapshot_options.xml"
-       follows="all"
-       layout="topleft"
-       left="0"
-       name="panel_snapshot_options"
-       top="0" />
-      <panel
-       class="llpanelsnapshotprofile"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_profile"
-       filename="panel_snapshot_profile.xml" />
-      <panel
-       class="llpanelsnapshotpostcard"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_postcard"
-       filename="panel_snapshot_postcard.xml" />
-      -->
-  <!--panel
-       class="llpaneloutfitsnapshotinventory"
-       follows="all"
-       layout="topleft"
-       name="panel_outfit_snapshot_inventory"
-       filename="panel_snapshot_inventory.xml"-->
       <panel
         class="llpaneloutfitsnapshotinventory"
         follows="left|top"
@@ -291,15 +237,6 @@
         top_pad="10"
         width="215"
       />
-      <!--
-      <panel
-       class="llpanelsnapshotlocal"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_local"
-       filename="panel_snapshot_local.xml" />
-      </panel_container>
--->
 	<view_border 
          bevel_style="in"
          follows="left|top" 
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
index ce6309e2ed..7261d429ba 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
@@ -59,53 +59,7 @@
          label="Large (512x512)"
          name="Large(512x512)"
          value="[i512,i512]" />
-        <combo_box.item
-         label="Current Window(512x512)"
-         name="CurrentWindow"
-         value="[i0,i0]" />
-        <combo_box.item
-         label="Custom"
-         name="Custom"
-         value="[i-1,i-1]" />
     </combo_box>
-    <spinner
-     allow_text_entry="false"
-     decimal_digits="0"
-     follows="left|top"
-     height="20"
-     increment="32"
-     label="Width x Height"
-     label_width="90"
-     layout="topleft"
-     left="10"
-     max_val="6016"
-     min_val="32"
-     name="inventory_snapshot_width"
-     top_pad="7"
-     width="144" />
-    <spinner
-     allow_text_entry="false"
-     decimal_digits="0"
-     follows="left|top"
-     height="20"
-     increment="32"
-     label=""
-     label_width="0"
-     layout="topleft"
-     left_pad="0"
-     max_val="6016"
-     min_val="32"
-     name="inventory_snapshot_height"
-     top_delta="0"
-     width="54" />
-    <check_box
-     top_pad="12"
-     follows="left|top"
-     label="Constrain proportions"
-     layout="topleft"
-     left="10"
-     name="inventory_keep_aspect_check"
-     visible="false" />
     <text
      follows="top|left"
      font="SansSerif"
@@ -118,7 +72,7 @@
      width="200"
      type="string"
      word_wrap="true">
-        Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
+        Uploading an image to your inventory costs L$[UPLOAD_COST].
     </text>
     <button
      follows="right|bottom"
@@ -130,12 +84,12 @@
      top="337"
      width="97">
       <button.commit_callback
-       function="Inventory.Cancel" />
+       function="Inventory.SaveOutfitCancel" />
     </button>
     <button
      follows="left|bottom"
      height="23"
-     label="Save"
+     label="UPLOAD L$10"
      layout="topleft"
      left="10"
      name="save_btn"
-- 
cgit v1.2.3