diff options
| author | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
| commit | b8d49dab9afddf196618d66b1a409cdf7d2d53ba (patch) | |
| tree | 535eb32ba4f17c87c0853cda9223c37a4940fea1 /indra/newview/llviewerobjectlist.h | |
| parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
| parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 741c7c7db9..20ed7d5562 100755 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -196,8 +196,6 @@ protected: std::vector<OrphanInfo> mOrphanChildren; // UUID's of orphaned objects S32 mNumOrphans; - static LLTrace::SampleStatHandle<LLUnit<F32, LLUnits::Percent> > sCacheHitRate; - typedef std::vector<LLPointer<LLViewerObject> > vobj_list_t; vobj_list_t mObjects; @@ -274,7 +272,7 @@ inline LLViewerObject *LLViewerObjectList::getObject(const S32 index) objectp = mObjects[index]; if (objectp->isDead()) { - //llwarns << "Dead object " << objectp->mID << " in getObject" << llendl; + //LL_WARNS() << "Dead object " << objectp->mID << " in getObject" << LL_ENDL; return NULL; } return objectp; |