From c43574dbb731f8a73c37f339c21bcffb1341b9a4 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 8 Aug 2014 19:07:21 +0200
Subject: STORM-2059: Removed: Useless 'Current Window' entry in resolution
 dropdown. We can go up to 512 only anyway.

---
 indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 5782ba7d04..ea579c6dae 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -47,10 +47,6 @@
      name="texture_size_combo"
      right="-5"
      top_pad="5">
-        <combo_box.item
-         label="Current Window"
-         name="CurrentWindow"
-         value="[i0,i0]" />
         <combo_box.item
          label="Small (128x128)"
          name="Small(128x128)"
-- 
cgit v1.2.3


From acf278cea1b3f71a2c548798b106e1959b7c485d Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 9 Aug 2014 02:29:23 +0200
Subject: STORM-2063: Fixed: Resolution text appearing for a brief moment when
 updating the controls while the preview is hidden.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 4b8f4c8fed..8451814c47 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -420,10 +420,11 @@
     type="string"
     font="SansSerifSmall"
     length="1"
-    follows="left|top"
+    follows="left|top|right"
     height="14"
     layout="topleft"
-    left_delta="5"
+    left="220"
+	right="-20"
     halign="left"
     name="image_res_text"
     top_delta="5"
-- 
cgit v1.2.3


From 0762c71bbe006d48de767a119c9b238f552b11b4 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 9 Aug 2014 02:31:47 +0200
Subject: STORM-2064: Changed: Made background of status text invisible.

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 8451814c47..c0907d6031 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -326,8 +326,7 @@
           </text>
       </panel>
       <panel
-       background_visible="true"
-       bg_alpha_color="0 0 0 0.25"
+       background_visible="false"
        follows="left|top"
        font="SansSerifLarge"
        halign="center"
-- 
cgit v1.2.3


From ea79b23e85a4e526b222582a585a55d490724e87 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Thu, 14 Aug 2014 03:36:28 +0200
Subject: STORM-2064: Changed: Made background of status text invisible. #2

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index c0907d6031..f0a175902b 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -294,8 +294,7 @@
          width="199"
          top_pad="-16"/>
 	<panel
-       background_visible="true"
-       bg_alpha_color="0 0 0 0.25"
+       background_visible="false"
        follows="left|top"
        font="SansSerifLarge"
        halign="center"
-- 
cgit v1.2.3