Merchant Outbox!
Enter: LLFloaterOutbox, floater_merchant_outbox, LLMarketplaceFunctions, LLPanelMarketplaceOutboxInventory, and panel_outbox_inventory
LLView now has childFromPoint() from v-d.
LLInventoryBridge{
Sync includes with v-d.
Let's ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU for ease of access and tweak it to work.
Uncomment related code.
Catch if we're moving objects into the outbox during pasteFromClipboard()
}
LLInventoryPanel: start_folder attribute for inventory_panels, this could be quite useful in the future
Sync LLToolDragAndDrop with Catznip/v-d
Add the outbox to the World menu, since that seems to involve most commerce. Perhaps we should add a menu entry to the outbox itself to open its floater?
Fix the inventory merchant menu entries, thanks Shyotl..
Merchant Outbox Strings!
This commit is contained in:
Lirusaito
@@ -0,0 +1,146 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<floater
|
||||
positioning="cascading"
|
||||
can_close="true"
|
||||
can_resize="true"
|
||||
height="440"
|
||||
help_topic="floater_merchant_outbox"
|
||||
min_width="300"
|
||||
min_height="200"
|
||||
name="floater_merchant_outbox"
|
||||
save_rect="true"
|
||||
save_visibility="false"
|
||||
reuse_instance="true"
|
||||
title="Merchant Outbox"
|
||||
width="333">
|
||||
<string name="OutboxFolderCount0">No folders</string>
|
||||
<string name="OutboxFolderCount1">1 folder</string>
|
||||
<string name="OutboxFolderCountN">[NUM] folders</string>
|
||||
<string name="OutboxImporting">Sending folders...</string>
|
||||
<string name="OutboxInitializing">Initializing...</string>
|
||||
<!--panel
|
||||
name="panel_1 this panel killed xui names, for some reason"
|
||||
follows="all"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
top="0"
|
||||
label=""
|
||||
height="440"
|
||||
width="333"-->
|
||||
<panel
|
||||
name="outbox_inventory_placeholder_panel"
|
||||
mouse_opaque="false"
|
||||
follows="all"
|
||||
layout="topleft"
|
||||
bottom="70"
|
||||
left="10"
|
||||
width="308"
|
||||
height="352"
|
||||
bg_opaque_color="InventoryBackgroundColor">
|
||||
<text
|
||||
name="outbox_inventory_placeholder_title"
|
||||
type="string"
|
||||
follows="top|left|right"
|
||||
layout="topleft"
|
||||
top="355"
|
||||
left="0"
|
||||
width="308"
|
||||
height="25"
|
||||
wrap="true"
|
||||
halign="center"
|
||||
font="SansSerifBold">
|
||||
Loading...
|
||||
</text>
|
||||
<text_editor
|
||||
name="outbox_inventory_placeholder_text"
|
||||
type="string"
|
||||
follows="top|left|right"
|
||||
layout="topleft"
|
||||
top="337"
|
||||
left="0"
|
||||
width="308"
|
||||
bottom="130"
|
||||
wrap="true"
|
||||
enabled="false"
|
||||
font="SansSerifSmall"
|
||||
hide_scrollbar="true"
|
||||
hide_border="true"
|
||||
bg_readonly_color="0 0 0 0"
|
||||
halign="left" />
|
||||
</panel>
|
||||
<inventory_panel
|
||||
name="panel_outbox_inventory"
|
||||
mouse_opaque="false"
|
||||
filename="panel_outbox_inventory.xml"
|
||||
follows="all"
|
||||
layout="topleft"
|
||||
bottom="70"
|
||||
left="10"
|
||||
width="308"
|
||||
height="352"
|
||||
bg_opaque_color="InventoryBackgroundColor"/>
|
||||
<panel
|
||||
name="panel_2"
|
||||
mouse_opaque="false"
|
||||
follows="bottom|left|right"
|
||||
left="10"
|
||||
bottom="5"
|
||||
width="313"
|
||||
top="70">
|
||||
<panel
|
||||
name="outbox_generic_drag_target"
|
||||
mouse_opaque="false"
|
||||
follows="left|right"
|
||||
bottom="33"
|
||||
left="0"
|
||||
width="308"
|
||||
height="25"
|
||||
background_visible="false"
|
||||
bg_alpha_color="0.950 0.412 0.173 0.35"
|
||||
border="true"
|
||||
bevel_style="in"
|
||||
visible="true">
|
||||
<text
|
||||
name="text_1"
|
||||
type="string"
|
||||
follows="all"
|
||||
layout="topleft"
|
||||
height="20"
|
||||
left="5"
|
||||
width="293"
|
||||
halign="center"
|
||||
font="SansSerifMedium"
|
||||
font_shadow="hard"
|
||||
valign="top">
|
||||
Drag items here to create folders
|
||||
</text>
|
||||
</panel>
|
||||
<text
|
||||
name="outbox_folder_count"
|
||||
type="string"
|
||||
follows="all"
|
||||
layout="topleft"
|
||||
bottom_delta="-27"
|
||||
left="0"
|
||||
width="150"
|
||||
height="20"
|
||||
wrap="true"
|
||||
halign="left"
|
||||
valign="center"
|
||||
font="SansSerif"/>
|
||||
<button
|
||||
label="Send to Marketplace"
|
||||
tool_tip="Push to my Marketplace Storefront"
|
||||
name="outbox_import_btn"
|
||||
follows="bottom|right"
|
||||
tab_stop="false"
|
||||
halign="center"
|
||||
bottom_delta="-3"
|
||||
left="160"
|
||||
height="25"
|
||||
width="150"
|
||||
enabled="false" />
|
||||
</panel>
|
||||
<text name="import_progress_indicator" left="160" height="440" top="438" width="333" follows="all" visible="false">Import in progress</text>
|
||||
<!--/panel-->
|
||||
</floater>
|
||||
@@ -311,11 +311,13 @@
|
||||
</menu_item_call>
|
||||
<menu_item_separator name="Marketplace Separator" />
|
||||
<menu_item_call bottom_delta="-18" height="18" label="Copy to Merchant Outbox" left="0" mouse_opaque="true"
|
||||
name="Merchant Copy" width="128"/>
|
||||
name="Merchant Copy" width="128">
|
||||
<on_click filter="" function="Inventory.DoToSelected" userdata="copy_to_outbox" />
|
||||
</menu_item_call>
|
||||
<menu_item_call bottom_delta="-18" height="18" label="Send to Marketplace" left="0" mouse_opaque="true"
|
||||
name="Marketplace Send" width="128"/>
|
||||
name="Marketplace Send" width="128">
|
||||
<on_click filter="" function="Inventory.DoToSelected" userdata="send_to_marketplace" />
|
||||
</menu_item_call>
|
||||
<menu_item_call bottom_delta="-18" height="18" label="--no options--" left="0"
|
||||
mouse_opaque="true" name="--no options--" width="128" />
|
||||
<!--menu_item_separator name="Wearable Separator" -->
|
||||
|
||||
@@ -547,6 +547,12 @@
|
||||
<on_click function="PromptShowURL" name="ManageMyAccount_url"
|
||||
userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
|
||||
</menu_item_call>
|
||||
<menu_item_check
|
||||
label="Merchant Outbox..."
|
||||
name="MerchantOutbox">
|
||||
<on_click function="ShowFloater" userdata="outbox" />
|
||||
<on_check function="FloaterVisible" userdata="outbox" />
|
||||
</menu_item_check>
|
||||
<menu_item_call bottom="-286" enabled="true" height="19" label="Buy [CURRENCY]..." left="0"
|
||||
mouse_opaque="true" name="Buy and Sell L$..." width="166">
|
||||
<on_click function="ShowFloater" userdata="buy currency" />
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<outbox_inventory_panel
|
||||
name="inventory_outbox"
|
||||
start_folder="Outbox"
|
||||
follows="all" layout="topleft"
|
||||
top="0" left="0" height="165" width="308"
|
||||
top_pad="0"
|
||||
bg_opaque_color="0.169 0.169 0.169 1"
|
||||
bg_alpha_color="0.169 0.169 0.169 1"
|
||||
background_visible="true"
|
||||
border="false"
|
||||
bevel_style="none"
|
||||
show_item_link_overlays="true"
|
||||
tool_tip="Drag and drop items here to prepare them for sale on your storefront"
|
||||
>
|
||||
<scroll reserve_scroll_corner="false" />
|
||||
</outbox_inventory_panel>
|
||||
@@ -2853,6 +2853,23 @@ Where tag = tag string to match. Removes bot's matching the tag.
|
||||
|
||||
<!-- inventory -->
|
||||
<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
|
||||
<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
|
||||
<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
|
||||
<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
|
||||
<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
|
||||
<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
|
||||
<string name="InventoryOutboxNotMerchantTitle">Anyone can sell items on the Marketplace.</string>
|
||||
<string name="InventoryOutboxNotMerchantTooltip"></string>
|
||||
<string name="InventoryOutboxNotMerchant">
|
||||
If you'd like to become a merchant, you'll need to
|
||||
</string>
|
||||
<string name="InventoryOutboxNotMerchantSubs">create a Marketplace store.</string>
|
||||
<string name="InventoryOutboxNoItemsTitle">Your outbox is empty.</string>
|
||||
<string name="InventoryOutboxNoItemsTooltip"></string>
|
||||
<string name="InventoryOutboxNoItems">
|
||||
Drag folders to this area and click "Send to Marketplace" to list them for sale on the
|
||||
</string>
|
||||
<string name="InventoryOutboxNoItemsSubs">Marketplace.</string>
|
||||
|
||||
<!-- use value="" because they have preceding spaces -->
|
||||
<string name="no_transfer" value=" (no transfer)" />
|
||||
|
||||
Reference in New Issue
Block a user