Merge vmm up to 3a62616f3dd8bd512fcdfd29ef033b2505b11213

This commit is contained in:
Inusaito Sayori
2015-08-01 13:07:30 -04:00
committed by Lirusaito
parent 1d6e2b4182
commit fd4155f4b6
12 changed files with 185 additions and 123 deletions

View File

@@ -291,6 +291,11 @@ void update_marketplace_category(const LLUUID& cur_uuid, bool perform_consistenc
LLNotificationsUtil::add("AlertMerchantVersionFolderEmpty");
LLMarketplaceData::instance().activateListing(listing_uuid, false,1);
}
else if (version_folder_uuid.notNull() && (count_descendants_items(version_folder_uuid) == 0))
{
LL_INFOS("SLM") << "Unlist as the version folder is empty of any item!!" << LL_ENDL;
LLMarketplaceData::instance().activateListing(listing_uuid, false);
}
}
// Check if the count on hand needs to be updated on SLM