Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings

Browse Source 
Merge VMM up to change 187902d9c4afd2990acddeb964c928179a52d189

mAllowWear=>mAllowOpen (should probably just remove this altogether though
inventory_panels now accept the "show_root_folder", "allow_drop_on_root", "allow_open", and "use_marketplace_folders" attributes.

Other stuff in this commit:
LLPanelInjector~
Sync lltooldraganddrop to alchemy
Sync notifications up with alchemy
Reorganize notifications some, to better merge with upstream
Remove duplicate InventorySortOrder in settings map
There's a bit of a weird folderview merge mixed into here, I wouldn't trust it, but this thing is so god damn tangled I can't go back now~

Wouldn't have been possible without help from Shyotl and music by Amanda Palmer
This commit is contained in:
Inusaito Sayori
2015-07-30 11:45:19 -04:00
committed by Lirusaito
parent 167d336274
commit f140b4f35c
46 changed files with 3480 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml
View File

@@ -13,7 +13,6 @@
save_rect="true"
save_visibility="false"
reuse_instance="true">
<string name="MarketplaceListingsInitializing">Initializing...</string>
<panel
name="marketplace_listings_panel"
follows="all"

16
indra/newview/skins/default/xui/en-us/menu_inventory.xml
View File

@@ -11,16 +11,16 @@
name="Marketplace Associate Listing">
<on_click function="Inventory.DoToSelected" userdata="marketplace_associate_listing"/>
</menu_item_call>
<menu_item_call
label="Unassociate listing"
name="Marketplace Disassociate Listing">
<on_click function="Inventory.DoToSelected" userdata="marketplace_disassociate_listing"/>
</menu_item_call>
<menu_item_call
label="Get (Refresh) listing"
name="Marketplace Get Listing">
<on_click function="Inventory.DoToSelected" userdata="marketplace_get_listing"/>
</menu_item_call>
<menu_item_call
label="Check for errors"
name="Marketplace Check Listing">
<on_click function="Inventory.DoToSelected" userdata="marketplace_check_listing"/>
</menu_item_call>
<menu_item_call
label="Edit listing"
name="Marketplace Edit Listing">
@@ -396,6 +396,12 @@
name="Merchant Copy" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="copy_to_outbox" />
</menu_item_call>
<menu_item_call label="Copy to Marketplace Listings" name="Marketplace Copy">
<on_click function="Inventory.DoToSelected" userdata="copy_to_marketplace_listings" />
</menu_item_call>
<menu_item_call label="Move to Marketplace Listings" name="Marketplace Move">
<on_click function="Inventory.DoToSelected" userdata="move_to_marketplace_listings" />
</menu_item_call>
<!-- Singu TODO: Remove Marketplace Send when removing Outbox -->
<menu_item_call bottom_delta="-18" height="18" label="Send to Marketplace" left="0" mouse_opaque="true"
name="Marketplace Send" width="128">

48
indra/newview/skins/default/xui/en-us/menu_marketplace_view.xml
View File

@@ -4,13 +4,45 @@
left="0" bottom="0" visible="false"
mouse_opaque="false">
<menu_item_check
label="Sort by stock amount (low to high)"
name="sort_by_stock_amount">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="sort_by_stock_amount"/>
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="sort_by_stock_amount"/>
label="Sort by name"
name="sort_by_name">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="sort_by_name" />
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="sort_by_name" />
</menu_item_check>
<menu_item_check
label="Sort by most recent"
name="sort_by_recent">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="sort_by_recent" />
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="sort_by_recent" />
</menu_item_check>
<menu_item_check
label="Sort by stock amount (low to high)"
name="sort_by_stock_amount">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="sort_by_stock_amount"/>
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="sort_by_stock_amount"/>
</menu_item_check>
<menu_item_separator
layout="topleft" />
<menu_item_check
label="Show only listing folders"
name="show_only_listing_folders">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="show_only_listing_folders"/>
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="show_only_listing_folders"/>
</menu_item_check>
</toggleable_menu>

1580
indra/newview/skins/default/xui/en-us/notifications.xml
View File

File diff suppressed because it is too large Load Diff

36
indra/newview/skins/default/xui/en-us/panel_marketplace_listings.xml
View File

@@ -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>
<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="0.38, 0.694, 0.573, 0.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 creat4e new listings
</text>
</panel>
</panel>

3
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_inventory.xml
View File

@@ -11,7 +11,8 @@
left="0"
start_folder.name="Marketplace listings"
show_empty_message="true"
show_root_folder="true"
show_root_folder="false"
use_marketplace_folders="true"
start_folder.type="merchant"
tool_tip="Drag and drop items here to list them"
bg_opaque_color="DkGray2"

3
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_listed.xml
View File

@@ -10,7 +10,8 @@
left_delta="0"
start_folder.name="Marketplace listings"
show_empty_message="true"
show_root_folder="true"
show_root_folder="false"
use_marketplace_folders="true"
allow_drop_on_root="false"
start_folder.type="merchant"
bg_opaque_color="DkGray2"

3
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unassociated.xml
View File

@@ -10,7 +10,8 @@
left_delta="0"
start_folder.name="Marketplace listings"
show_empty_message="true"
show_root_folder="true"
show_root_folder="false"
use_marketplace_folders="true"
start_folder.type="merchant"
bg_opaque_color="DkGray2"
bg_alpha_color="DkGray2"

3
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unlisted.xml
View File

@@ -10,7 +10,8 @@
left_delta="0"
start_folder.name="Marketplace listings"
show_empty_message="true"
show_root_folder="true"
show_root_folder="false"
use_marketplace_folders="true"
allow_drop_on_root="false"
start_folder.type="merchant"
bg_opaque_color="DkGray2"

2
indra/newview/skins/default/xui/en-us/panel_outbox_inventory.xml
View File

@@ -12,6 +12,8 @@
bevel_style="none"
show_item_link_overlays="true"
tool_tip="Drag and drop items here to prepare them for sale on your storefront"
allow_open="false"
allow_drop_on_root="false"
>
<scroll reserve_scroll_corner="false" />
</outbox_inventory_panel>

18
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -109,17 +109,18 @@ Make sure you entered the correct Login URI. An example of a Login URI is: \"htt
<string name="TooltipLand">Land:</string>
<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
<string name="TooltipOutboxDragToWorld">You can not rez items on the marketplace</string>
<string name="TooltipOutboxDragToWorld">You can not rez items from the Marketplace Listings folder</string>
<string name="TooltipOutboxWorn">You can't put items you are wearing in the Marketplace Listings folder</string>
<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]. Decrease the depth of folders-within-folders; box items if necessary.</string>
<string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary.</string>
<string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them.</string>
<string name="TooltipOutboxTooManyStockItems">Stock items count exceeds [AMOUNT].</string>
<string name="TooltipOutboxCannotDropOnRoot">You can only drop items or folders in the ALL or UNASSOCIATED tabs. Please select that tab and move your item(s) or folder(s) again.</string>
<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
<string name="TooltipOutboxWorn">You can't put items you are wearing on the marketplace</string>
<string name="TooltipOutboxLinked">You can't put linked items or folders on the marketplace</string>
<string name="TooltipOutboxCallingCard">You can't put calling cards on the marketplace</string>
<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
<string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]</string>
<string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]</string>
<string name="TooltipOutboxDragActive">You can't move a listed listing</string>
<string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
<string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
@@ -3213,6 +3214,9 @@ The
</string>
<string name="InventoryOutboxErrorSubs">Marketplace store</string>
<string name="InventoryOutboxError2">is returning errors.</string>
<string name="InventoryMarketplaceError">
This feature is currently in Beta. Please add your name to this [http://goo.gl/forms/FCQ7UXkakz Google form] if you would like to participate.
</string>
<string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
<string name="InventoryMarketplaceListingsNoItemsTooltip"></string>
<string name="InventoryMarketplaceListingsNoItems">
@@ -3234,6 +3238,8 @@ The
<string name="Marketplace Validation Warning">: Warning: </string>
<string name="Marketplace Validation Error Empty Version">: Warning: version folder must contain at least 1 item</string>
<string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string>
<string name="Marketplace Validation No Error">No errors or warnings to report</string>
<string name="Marketplace Error None">No errors</string>
<string name="Marketplace Error Prefix">Error: </string>
<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>