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

16
indra/newview/llvlmanager.cpp
View File

@@ -47,11 +47,11 @@ LLVLManager gVLManager;
LLVLManager::~LLVLManager()
{
S32 i;
for (i = 0; i < mPacketData.count(); i++)
for (i = 0; i < mPacketData.size(); i++)
{
delete mPacketData[i];
}
mPacketData.reset();
mPacketData.clear();
}
void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size)
@@ -88,7 +88,7 @@ void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size)
LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL;
}
mPacketData.put(vl_datap);
mPacketData.push_back(vl_datap);
}
void LLVLManager::unpackData(const S32 num_packets)
@@ -96,7 +96,7 @@ void LLVLManager::unpackData(const S32 num_packets)
static LLFrameTimer decode_timer;
S32 i;
for (i = 0; i < mPacketData.count(); i++)
for (i = 0; i < mPacketData.size(); i++)
{
LLVLData *datap = mPacketData[i];
@@ -128,11 +128,11 @@ void LLVLManager::unpackData(const S32 num_packets)
}
}
for (i = 0; i < mPacketData.count(); i++)
for (i = 0; i < mPacketData.size(); i++)
{
delete mPacketData[i];
}
mPacketData.reset();
mPacketData.clear();
}
@@ -164,12 +164,12 @@ S32 LLVLManager::getTotalBytes() const
void LLVLManager::cleanupData(LLViewerRegion *regionp)
{
S32 cur = 0;
while (cur < mPacketData.count())
while (cur < mPacketData.size())
{
if (mPacketData[cur]->mRegionp == regionp)
{
delete mPacketData[cur];
mPacketData.remove(cur);
mPacketData.erase(mPacketData.begin() + cur);
}
else
{