diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-11-16 14:26:33 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-11-16 14:26:33 -0800 |
| commit | 43745ce2714eca8dce95e08a89eeb3c278b0be3f (patch) | |
| tree | 48961bcc30fac8d9ad04f70f53aa7e7fedfdaecf /indra/newview | |
| parent | d0afd691526a51a99223d056398c1ede5bb93494 (diff) | |
DD-281 : Do not unlist listings that go out of stock
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 2 |
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> |