summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-12-22 16:33:47 -0800
committerMerov Linden <merov@lindenlab.com>2014-12-22 16:33:47 -0800
commite8ea398e123be29227275e8ca5b1d2d0ce7f1e4f (patch)
tree0e05274270a8b922aabe6fda792cc2a37c2014c8 /indra/newview/skins
parentb0f590f6ab4033503ff9d80e2374e374397d40fb (diff)
DD-282 : Suppress Unassociate menu item. Confirm when cutting, deleting or moving a listing
Diffstat (limited to 'indra/newview/skins')
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_inventory.xml8
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml13
2 files changed, 13 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index e28a02550f..63f408c05c 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -21,14 +21,6 @@
parameter="marketplace_associate_listing" />
</menu_item_call>
<menu_item_call
- label="Unassociate listing"
- layout="topleft"
- name="Marketplace Disassociate Listing">
- <menu_item_call.on_click
- function="Inventory.DoToSelected"
- parameter="marketplace_disassociate_listing" />
- </menu_item_call>
- <menu_item_call
label="Get (Refresh) listing"
layout="topleft"
name="Marketplace Get Listing">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5b0bdc4a0d..4d856ed8a7 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="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?
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Confirm before I move or delete a listing from the marketplace"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="ConfirmMerchantUnlist"
type="alertmodal">
This action will unlist this listing. Do you want to continue?