Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045

Browse Source
This commit is contained in:
Shyotl
2015-06-26 20:59:31 -05:00
parent 4d61305095
commit a380161283
27 changed files with 714 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/rlvlocks.cpp
View File

@@ -1164,8 +1164,11 @@ bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::it
// Check the parent folders of any links to this item that exist under #RLV
if (!fItemLocked)
{
LLInventoryModel::item_array_t itemLinks =
gInventory.collectLinksTo(pItem->getUUID(), RlvInventory::instance().getSharedRootID());
LLInventoryModel::item_array_t itemLinks;
LLInventoryModel::cat_array_t cats;
LLLinkedItemIDMatches f(pItem->getUUID());
gInventory.collectDescendentsIf(RlvInventory::instance().getSharedRootID(), cats, itemLinks, LLInventoryModel::EXCLUDE_TRASH, f);
for (LLInventoryModel::item_array_t::iterator itItemLink = itemLinks.begin();
(itItemLink < itemLinks.end()) && (!fItemLocked); ++itItemLink)
{
@@ -1204,7 +1207,7 @@ bool RlvFolderLocks::hasLockedFolderDescendent(const LLUUID& idFolder, int eSour
LLInventoryModel::cat_array_t folders; LLInventoryModel::item_array_t items;
RlvLockedDescendentsCollector f(eSourceTypeMask, ePermMask, eLockTypeMask);
gInventory.collectDescendentsIf(idFolder, folders, items, FALSE, f, FALSE);
gInventory.collectDescendentsIf(idFolder, folders, items, FALSE, f, false);
return !folders.empty();
}