diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-12-26 10:40:41 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-12-26 10:40:41 -0800 |
| commit | ddb9d0eeadd9d73a2719dbec2feb9c9226e2f00e (patch) | |
| tree | eb05879f71e3da508f5e0b06d1e381b4a4659e49 /indra/newview/skins | |
| parent | e8ea398e123be29227275e8ca5b1d2d0ce7f1e4f (diff) | |
DD-296 : Added contextual menu items to copy and move to the marketplace. Hide copy to merchant outbox. Message when moving to the marketplace.
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_inventory.xml | 16 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 13 |
2 files changed, 29 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 63f408c05c..4187bf9d47 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -785,6 +785,22 @@ parameter="copy_to_outbox" /> </menu_item_call> <menu_item_call + label="Copy to Marketplace Listings" + layout="topleft" + name="Marketplace Copy"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="copy_to_marketplace_listings" /> + </menu_item_call> + <menu_item_call + label="Move to Marketplace Listings" + layout="topleft" + name="Marketplace Move"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="move_to_marketplace_listings" /> + </menu_item_call> + <menu_item_call label="--no options--" layout="topleft" name="--no options--" /> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4d856ed8a7..bb7f296285 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -371,6 +371,19 @@ Initialization with the Marketplace failed because of a system or network error. <notification icon="alertmodal.tga" + name="ConfirmMerchantMoveInventory" + type="alertmodal"> + Items dragged to the Marketplace Items window are moved from their original locations, not copied. Do you want to continue? + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm before I move an item from the inventory to the marketplace" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmListingCutOrDelete" type="alertmodal"> Moving or deleting a listing folder will delete your Marketplace listing. If you would like to keep the Marketplace listing, move or delete the contents of the version folder you would like to modify. Do you want to continue? |