diff options
| author | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 11:23:33 -0600 |
|---|---|---|
| committer | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 11:23:33 -0600 |
| commit | 6d4b4762d1eb0a1431e1793a7254f8cac220062a (patch) | |
| tree | 1076c9227658d6637a424f9266bf3832f371aaaa /indra/newview/lldrawable.cpp | |
| parent | bc7f2e41fd268895774f9ddffd45be318662dcaa (diff) | |
| parent | 4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 244fed791f..634cff14a3 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -189,20 +189,30 @@ BOOL LLDrawable::isLight() const } } +static LLFastTimer::DeclareTimer FTM_CLEANUP_DRAWABLE("Cleanup Drawable"); +static LLFastTimer::DeclareTimer FTM_DEREF_DRAWABLE("Deref"); +static LLFastTimer::DeclareTimer FTM_DELETE_FACES("Faces"); + void LLDrawable::cleanupReferences() { - LLFastTimer t(FTM_PIPELINE); + LLFastTimer t(FTM_CLEANUP_DRAWABLE); - std::for_each(mFaces.begin(), mFaces.end(), DeletePointer()); - mFaces.clear(); + { + LLFastTimer t(FTM_DELETE_FACES); + std::for_each(mFaces.begin(), mFaces.end(), DeletePointer()); + mFaces.clear(); + } gObjectList.removeDrawable(this); gPipeline.unlinkDrawable(this); - // Cleanup references to other objects - mVObjp = NULL; - mParent = NULL; + { + LLFastTimer t(FTM_DEREF_DRAWABLE); + // Cleanup references to other objects + mVObjp = NULL; + mParent = NULL; + } } void LLDrawable::cleanupDeadDrawables() |