summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llinventoryfunctions.cpp5
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml2
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index e5a515383e..a11339358a 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1565,14 +1565,13 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
cb(message,LLError::LEVEL_ERROR);
}
}
- // If this is a legit but empty stock folder, raise an error
else if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && (depth > 2))
{
- result = false;
+ // If this is a legit but empty stock folder, warn only (listing must stay searchable when empty)
if (cb)
{
std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Empty Stock");
- cb(message,LLError::LEVEL_ERROR);
+ cb(message,LLError::LEVEL_WARN);
}
}
else if (cb)
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 66fe9f2931..892aed390a 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2308,7 +2308,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<string name="Marketplace Validation Error">: Error: </string>
<string name="Marketplace Validation Warning">: Warning: </string>
<string name="Marketplace Validation Error Empty Version">: Error: version folder must contain at least 1 item</string>
- <string name="Marketplace Validation Error Empty Stock">: Error: stock 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 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>