diff options
| author | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
|---|---|---|
| committer | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
| commit | 5754493cdcfeac76d0576abc19bdf5a03717780d (patch) | |
| tree | e6db53ae1cd654f9b2a1a6b9ab47e01ea738ecef /indra/newview/llviewerobjectlist.cpp | |
| parent | cc22ffc6d799544e8f2a9dfed6813081d908c88d (diff) | |
| parent | 9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff) | |
Merged lindenlab/viewer64 into default
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 8f98d66c0c..3c83e3a006 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1247,9 +1247,11 @@ void LLViewerObjectList::clearDebugText() void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp) { + bool new_dead_object = true; if (mDeadObjects.find(objectp->mID) != mDeadObjects.end()) { LL_INFOS() << "Object " << objectp->mID << " already on dead list!" << LL_ENDL; + new_dead_object = false; } else { @@ -1286,7 +1288,10 @@ void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp) // Also, not cleaned up removeDrawable(objectp->mDrawable); - mNumDeadObjects++; + if(new_dead_object) + { + mNumDeadObjects++; + } } static LLTrace::BlockTimerStatHandle FTM_REMOVE_DRAWABLE("Remove Drawable"); |