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: [PATCH] DD-300 : WIP : Add drop zone to marketplace (XUI work)
---
.../skins/default/textures/textures.xml | 1 +
.../Marketplace_Dropzone_Background.png | Bin 0 -> 459 bytes
.../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
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 392eaf85a3b..eb8ab741f0b 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 0000000000000000000000000000000000000000..9478f7b813eccf8a0750a76dc818910eb7c8dd77
GIT binary patch
literal 459
zcmeAS@N?(olHy`uVBq!ia0y~yVB`a`H8|LSB)_qU6_AoFag8Vm&QB{TPb^Aha7@Wh
zN>%X8O-xS>N=;0uEIgTN1Jsr4>EaktaqG=p$E@Z6iPnoxuDvaNCp5R*_}#IzAdcJx
zJ6$_(eQr~<T)=NvW3RGP?{v}6sK*xj;^#$NHmSAwY$w-W?x(+gU&rlDnKt(h?&)Cb
zKc2l8nS40);*OhUy~nK=h+lm0v0|<Gabdas>s5lh2(o!5k}ivRA1d}-+kLP8WbWz=
zo2o|}faVtN&5`9bpLyJRKEw?3HL|?T0dnvE#JMydf4ntL#=pWQ?zO84I>}q#+vcdz
z|Gj?i_R4v#K&7E^w=#B|w2{+abnx-Vu)k*mK~Cz2y87Yv42hOc6?@*VhnRHqV++V|
zh!sfWy@KzJcVmy-3Vi&r;&lbYBR3yEp5*)Z<F~iSj`;gSeY>qoa_>y;{^PgL{T4}J
YD4Bd)pg*TR0~k9Dp00i_>zopr0D7s}NB{r;
literal 0
HcmV?d00001
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 9f319273a8b..68d75440bdc 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
--
GitLab