summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-11 20:25:15 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-11 20:25:15 -0700
commitdd070683e8aedac36919144ca13a7c9a405d653a (patch)
tree71ee9a6fd8686eef59e34748f86f5eb3383a2830 /indra/newview
parent1b4408e59d6798e2916ce9bcbedbd729fde0d959 (diff)
DD-59 : WIP : Fixed consistency check bug
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llinventoryfunctions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 0aba4f57a0..ae9480326c 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -173,7 +173,7 @@ void update_marketplace_category(const LLUUID& cat_id)
if (LLMarketplaceData::instance().isListed(listing_uuid))
{
LLUUID version_folder_uuid = LLMarketplaceData::instance().getVersionFolderID(listing_uuid);
- if (!gInventory.isObjectDescendentOf(version_folder_uuid, listing_uuid))
+ if (version_folder_uuid.notNull() && !gInventory.isObjectDescendentOf(version_folder_uuid, listing_uuid))
{
// *TODO : Confirm with Producer that this is what we want to happen in that case!
llinfos << "Merov : Delisting as the version folder is not under the listing folder anymore!!" << llendl;