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

LLViewerObjectList::mDeadObjects has no reason to be a std::map any longer. Converted to std::set as per v2.

Browse Source
This commit is contained in:
Shyotl
2011-05-04 19:55:17 -05:00
parent 8cc6092a1c
commit 96f400eb4c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewerobjectlist.cpp
View File

@@ -827,13 +827,14 @@ void LLViewerObjectList::clearDebugText()
void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp) void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
{ {
LLMemType mt(LLMemType::MTYPE_OBJECT); LLMemType mt(LLMemType::MTYPE_OBJECT);
if (mDeadObjects.count(objectp->mID)) if (mDeadObjects.find(objectp->mID) != mDeadObjects.end())
{ {
llinfos << "Object " << objectp->mID << " already on dead list, ignoring cleanup!" << llendl; llinfos << "Object " << objectp->mID << " already on dead list!" << llendl;
return; }
else
{
mDeadObjects.insert(objectp->mID);
} }
mDeadObjects.insert(std::pair<LLUUID, LLPointer<LLViewerObject> >(objectp->mID, objectp));
// Cleanup any references we have to this object // Cleanup any references we have to this object
// Remove from object map so noone can look it up. // Remove from object map so noone can look it up.

3
indra/newview/llviewerobjectlist.h
View File

@@ -202,8 +202,7 @@ protected:
vobj_list_t mMapObjects; vobj_list_t mMapObjects;
typedef std::map<LLUUID, LLPointer<LLViewerObject> > vo_map; std::set<LLUUID> mDeadObjects;
vo_map mDeadObjects; // Need to keep multiple entries per UUID
std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap; std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
std::map<LLUUID, LLPointer<LLVOAvatar> > mUUIDAvatarMap; std::map<LLUUID, LLPointer<LLVOAvatar> > mUUIDAvatarMap;