From 88dca882ae04b6c4bf8fcffda897684505756f54 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 17 Jan 2015 22:23:17 -0800
Subject: DD-300 : WIP : Add drop zone to marketplace (XUI work)

---
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../widgets/Marketplace_Dropzone_Background.png    | Bin 0 -> 459 bytes
 .../default/xui/en/panel_marketplace_listings.xml  |  34 +++++++++++++++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 392eaf85a3..eb8ab741f0 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -336,6 +336,7 @@ with the same filename but different name
 
   <texture name="Map_Placeholder_Icon" file_name="icons/map_placeholder.png" preload="true" />
     
+  <texture name="Marketplace_Dropzone_Background" file_name="widgets/Marketplace_Dropzone_Background.png" preload="true" />
   <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
   <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
 
diff --git a/indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png b/indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png
new file mode 100644
index 0000000000..9478f7b813
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index 9f319273a8..68d75440bd 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -56,7 +56,7 @@
     layout="topleft"
     default_tab_group="1"
     width="308"
-    height="400">
+    height="350">
   <filter_editor
     text_pad_left="10"
     follows="left|top|right"
@@ -76,7 +76,7 @@
     left="0"
     top_pad="0"
     width="308"
-    height="370"
+    height="320"
     halign="center"
     tab_height="30"
     tab_group="1"
@@ -84,4 +84,34 @@
     tab_min_width="50">
   </tab_container>
   </panel>
+  <panel
+      name="marketplace_drop_zone"
+      mouse_opaque="false"
+      follows="bottom|left|right"
+      left="2"
+      width="306"
+      height="40"
+      background_visible="true"
+      background_opaque="true"
+      bg_alpha_image="none"
+      bg_alpha_color="EmphasisColor_35"
+      bg_opaque_image="Marketplace_Dropzone_Background"
+      border="true"
+      bevel_style="in"
+      visible="true">
+      <text
+          type="string"
+          follows="bottom|left|right"
+          layout="topleft"
+          top="13"
+          height="20"
+          left="2"
+          width="306"
+          halign="center"
+          font="SansSerifMedium"
+          font_shadow="hard"
+          valign="top">
+          Drop folders here to create new listings
+      </text>
+  </panel>
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3