From e65a4b323c90e4c0b9ec3eea92c96b86461e5bab Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 15 Jul 2012 00:06:48 +0200 Subject: [PATCH] - fixed : "nostrip" doesn't have any effect when placed in the name of a folder that's a direct descendant of the inventory root --HG-- branch : RLVa --- indra/newview/rlvhelper.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index d506250701..17091ce6e2 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -698,13 +698,15 @@ bool RlvForceWear::isStrippable(const LLInventoryItem* pItem) } LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID()); - while ( (pFolder) && (gInventory.getRootFolderID() != pFolder->getParentUUID()) ) + while (pFolder) { if (std::string::npos != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP)) return false; // If the item's parent is a folded folder then we need to check its parent as well - pFolder = - (RlvInventory::isFoldedFolder(pFolder, true)) ? gInventory.getCategory(pFolder->getParentUUID()) : NULL; + if ( (gInventory.getRootFolderID() != pFolder->getParentUUID()) && (RlvInventory::isFoldedFolder(pFolder, true)) ) + pFolder = gInventory.getCategory(pFolder->getParentUUID()); + else + pFolder = NULL; } } return true;