livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DD-281 : Do not unlist listings that go out of stock

meow-7.2.2
Merov Linden 2014-11-16 14:26:33 -08:00
parent d0afd69152
commit 43745ce271
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llinventoryfunctions.cpp
View File

@ -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)

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -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>