From efe093ec08ce3a167eec9b33dbb39964bf98c4f6 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 10 Sep 2011 23:42:43 +0200 Subject: [PATCH] - 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 --- indra/newview/rlvinventory.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/rlvinventory.cpp b/indra/newview/rlvinventory.cpp index af965e10ae..764427654a 100644 --- a/indra/newview/rlvinventory.cpp +++ b/indra/newview/rlvinventory.cpp @@ -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