summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_marketplace_listings.xml2
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml1
2 files changed, 3 insertions, 0 deletions
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 3d75ad4488..4a2d9f27e0 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -111,6 +111,7 @@
show_empty_message="false"
show_load_status="false"
show_root_folder="true"
+ allow_drop_on_root="false"
start_folder.type="merchant"
bg_opaque_color="DkGray2"
bg_alpha_color="DkGray2"
@@ -133,6 +134,7 @@
show_empty_message="false"
show_load_status="false"
show_root_folder="true"
+ allow_drop_on_root="false"
start_folder.type="merchant"
bg_opaque_color="DkGray2"
bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index aa66fc4718..21c82b6290 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -245,6 +245,7 @@ Please try logging in again in a minute.</string>
<string name="TooltipOutboxTooManyFolders">Subfolders count exceeds [AMOUNT]</string>
<string name="TooltipOutboxTooManyObjects">Items count exceeds [AMOUNT]</string>
<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
+ <string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>