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

Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 18:27:21 -05:00
parent 1c627317ec
commit 09f4528bfb
122 changed files with 883 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/rlvlocks.cpp
View File

@@ -1063,7 +1063,7 @@ void RlvFolderLocks::addFolderLock(const folderlock_source_t& lockSource, ELockP
// Checked: 2011-03-28 (RLVa-1.3.0g) | Modified: RLVa-1.3.0g
bool RlvFolderLocks::getLockedFolders(const folderlock_source_t& lockSource, LLInventoryModel::cat_array_t& lockFolders) const
{
S32 cntFolders = lockFolders.count();
S32 cntFolders = lockFolders.size();
switch (lockSource.first)
{
case ST_ATTACHMENT:
@@ -1125,13 +1125,13 @@ bool RlvFolderLocks::getLockedFolders(const folderlock_source_t& lockSource, LLI
default:
return false;
};
return cntFolders != lockFolders.count();
return cntFolders != lockFolders.size();
}
// Checked: 2011-11-26 (RLVa-1.5.4a) | Modified: RLVa-1.5.4a
bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::item_array_t& lockItems) const
{
S32 cntItems = lockItems.count();
S32 cntItems = lockItems.size();
LLInventoryModel::cat_array_t folders; LLInventoryModel::item_array_t items;
LLFindWearablesEx f(true, true); // Collect all worn items
@@ -1141,9 +1141,9 @@ bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::it
std::map<LLUUID, bool> folderLookups; std::map<LLUUID, bool>::const_iterator itLookup;
bool fItemLocked = false;
for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
for (S32 idxItem = 0, cntItem = items.size(); idxItem < cntItem; idxItem++)
{
LLViewerInventoryItem* pItem = items.get(idxItem);
LLViewerInventoryItem* pItem = items.at(idxItem);
if (LLAssetType::AT_LINK == pItem->getActualType())
pItem = pItem->getLinkedItem();
if (!pItem)
@@ -1188,7 +1188,7 @@ bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::it
lockItems.push_back(pItem);
}
return cntItems != lockItems.count();
return cntItems != lockItems.size();
}
// Checked: 2011-03-29 (RLVa-1.3.0g) | Added: RLVa-1.3.0g
@@ -1305,9 +1305,9 @@ void RlvFolderLocks::refreshLockedLookups() const
LLInventoryModel::cat_array_t lockedFolders; const LLUUID& idFolderRoot = gInventory.getRootFolderID();
if (getLockedFolders(pLockDescr->lockSource, lockedFolders))
{
for (S32 idxFolder = 0, cntFolder = lockedFolders.count(); idxFolder < cntFolder; idxFolder++)
for (S32 idxFolder = 0, cntFolder = lockedFolders.size(); idxFolder < cntFolder; idxFolder++)
{
const LLViewerInventoryCategory* pFolder = lockedFolders.get(idxFolder);
const LLViewerInventoryCategory* pFolder = lockedFolders.at(idxFolder);
if (idFolderRoot != pFolder->getUUID())
m_LockedFolderMap.insert(std::pair<LLUUID, const folderlock_descr_t*>(pFolder->getUUID(), pLockDescr));
else
@@ -1326,9 +1326,9 @@ void RlvFolderLocks::refreshLockedLookups() const
LLInventoryModel::item_array_t lockedItems;
if (getLockedItems(LLAppearanceMgr::instance().getCOF(), lockedItems))
{
for (S32 idxItem = 0, cntItem = lockedItems.count(); idxItem < cntItem; idxItem++)
for (S32 idxItem = 0, cntItem = lockedItems.size(); idxItem < cntItem; idxItem++)
{
const LLViewerInventoryItem* pItem = lockedItems.get(idxItem);
const LLViewerInventoryItem* pItem = lockedItems.at(idxItem);
switch (pItem->getType())
{
case LLAssetType::AT_BODYPART: