diff options
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 36 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 9 |
2 files changed, 29 insertions, 16 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index eb218b6a51..b4a07e20f2 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1407,7 +1407,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ result = false; if (cb) { - message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error") + message; + message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error") + " " + message; cb(message,LLError::LEVEL_ERROR); } } @@ -1416,13 +1416,13 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ // Check out that stock folders are at the right level if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && (depth <= 2)) { - if (cb) - { - std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning Stock"); - cb(message,LLError::LEVEL_WARN); - } if (fix_hierarchy) { + if (cb) + { + std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning") + " " + LLTrans::getString("Marketplace Validation Warning Stock"); + cb(message,LLError::LEVEL_WARN); + } // Nest the stock folder one level deeper in a normal folder and restart from there LLUUID parent_uuid = cat->getParentUUID(); LLUUID folder_uuid = gInventory.createNewCategory(parent_uuid, LLFolderType::FT_NONE, cat->getName()); @@ -1431,6 +1431,15 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ result &= validate_marketplacelistings(new_cat, cb, fix_hierarchy); return result; } + else + { + result = false; + if (cb) + { + std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error") + " " + LLTrans::getString("Marketplace Validation Warning Stock"); + cb(message,LLError::LEVEL_ERROR); + } + } } LLInventoryModel::cat_array_t* cat_array; @@ -1461,7 +1470,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ has_bad_items = true; if (cb && fix_hierarchy) { - std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error") + error_msg; + std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error") + " " + error_msg; cb(message,LLError::LEVEL_ERROR); } continue; @@ -1594,8 +1603,9 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && (count >= 2)) { // Report if a stock folder contains a mix of items - std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning Mixed Stock"); - cb(message,LLError::LEVEL_WARN); + result = false; + std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Mixed Stock"); + cb(message,LLError::LEVEL_ERROR); } else { @@ -1614,14 +1624,16 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ if (!can_move_to_marketplace(item, error_msg, false)) { // Report items that shouldn't be there to start with - std::string message = indent + " " + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error") + error_msg; + result = false; + std::string message = indent + " " + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error") + " " + error_msg; cb(message,LLError::LEVEL_ERROR); } else if ((!viewer_inv_item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID())) && (folder_type != LLFolderType::FT_MARKETPLACE_STOCK)) { // Report stock items that are misplaced - std::string message = indent + " " + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Warning Stock Item"); - cb(message,LLError::LEVEL_WARN); + result = false; + std::string message = indent + " " + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error Stock Item"); + cb(message,LLError::LEVEL_ERROR); } else if (depth == 1) { diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 97d8c3ce5c..f79c8352e1 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2294,16 +2294,17 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. </string> <string name="Marketplace Validation Log"></string> - <string name="Marketplace Validation Warning Stock">: Warning: stock folder must be contained by a version folder</string> - <string name="Marketplace Validation Warning Mixed Stock">: Warning: all items in a stock folder must be no-copy and of the same type</string> - <string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any item</string> + <string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string> + <string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string> + <string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any items</string> <string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string> <string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string> <string name="Marketplace Validation Warning Move">: Warning : moving items</string> <string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string> - <string name="Marketplace Validation Warning Stock Item">: Warning: no-copy item must be contained by a stock folder</string> + <string name="Marketplace Validation Error Stock Item">: Error: no-copy items must be contained by a stock folder</string> <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 Stock">: Error: stock folder must contain at least 1 item</string> <string name="Marketplace Error None">No errors</string> |