summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2010-02-12 15:16:19 -0800
committerPalmer <palmer@lindenlab.com>2010-02-12 15:16:19 -0800
commit418504207bdbdac9b41f731d87562d7d08a229d2 (patch)
tree8eb914baeeaa05fb8ce6f4556eabd697b3c45afe /indra/newview/llviewerobject.cpp
parent434436ef6b96f74eaf0daf687c6978d5a24d5be7 (diff)
parent43ca4e104b613c95a1147751122f7ff007542e5c (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d0afa9d9de..b5642d07a5 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2001,6 +2001,9 @@ BOOL LLViewerObject::isActive() const
BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
{
+ static LLFastTimer::DeclareTimer ftm("Viewer Object");
+ LLFastTimer t(ftm);
+
if (mDead)
{
// It's dead. Don't update it.