diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 7 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index a11339358a..d1acbee533 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1555,19 +1555,18 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ { if (cat_array->size() == 0) { - // If this is an empty version folder, raise an error if (depth == 2) { - result = false; + // If this is an empty version folder, warn only (listing won't be delivered by AIS, but only AIS should unlist) if (cb) { std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Empty Version"); - cb(message,LLError::LEVEL_ERROR); + cb(message,LLError::LEVEL_WARN); } } else if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && (depth > 2)) { - // If this is a legit but empty stock folder, warn only (listing must stay searchable when empty) + // If this is a legit but empty stock folder, warn only (listing must stay searchable when out of stock) if (cb) { std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Empty Stock"); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 892aed390a..fa9c1f5168 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2307,7 +2307,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f <string name="Marketplace Validation Warning Unwrapped Item">: Warning: items must be contained by a version folder</string> <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 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 Error None">No errors</string> <string name="Marketplace Error Prefix">Error: </string> |