- fixed : crash when issuing @getinvworn on a folder containing a folder link to a folder with subfolders (thankies eloise)

-> only direct or folded descendents of the linked folder should be collected (see 56ec506fee96)

--HG--
branch : RLVa
meow-7.2.2
Kitty Barnett 2011-09-10 23:42:43 +02:00
parent daa0178a9f
commit efe093ec08
1 changed files with 2 additions and 1 deletions

View File

@ -668,7 +668,8 @@ bool RlvWearableItemCollector::onCollectFolder(const LLInventoryCategory* pFolde
}
}
else if ( (RLV_FOLDER_PREFIX_HIDDEN != strFolder[0]) && // Collect from any non-hidden child folder for *all
( (fMatchAll) || (fLinkedFolder) ) ) // ... and collect from linked folders
( (fMatchAll) || (fLinkedFolder) ) && // ... and collect from linked folders
(!isLinkedFolder(pFolder->getParentUUID())) ) // ... but never from non-folded linked folder descendents
{
#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
if ( (!RlvSettings::getEnableComposites()) || // ... if we're not checking composite folders