Initial AISv3 merge. New HTTP messages not plugged in yet.

This commit is contained in:
Shyotl
2015-06-25 20:16:30 -05:00
parent 09f4528bfb
commit 9f10d9510d
71 changed files with 4962 additions and 3452 deletions

View File

@@ -1165,7 +1165,7 @@ bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::it
if (!fItemLocked)
{
LLInventoryModel::item_array_t itemLinks =
gInventory.collectLinkedItems(pItem->getUUID(), RlvInventory::instance().getSharedRootID());
gInventory.collectLinksTo(pItem->getUUID(), RlvInventory::instance().getSharedRootID());
for (LLInventoryModel::item_array_t::iterator itItemLink = itemLinks.begin();
(itItemLink < itemLinks.end()) && (!fItemLocked); ++itItemLink)
{