diff options
author | Merov Linden <merov@lindenlab.com> | 2015-01-17 22:23:17 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-01-17 22:23:17 -0800 |
commit | 88dca882ae04b6c4bf8fcffda897684505756f54 (patch) | |
tree | ce5ac0475072e36196b7a0f804a6ae4237605c51 /indra/newview | |
parent | 162d33dec4444c97837eba7e64eff964389d5987 (diff) |
DD-300 : WIP : Add drop zone to marketplace (XUI work)
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png | bin | 0 -> 459 bytes | |||
-rwxr-xr-x | indra/newview/skins/default/xui/en/panel_marketplace_listings.xml | 34 |
3 files changed, 33 insertions, 2 deletions
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 Binary files differnew file mode 100644 index 0000000000..9478f7b813 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Marketplace_Dropzone_Background.png 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 |