summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2010-02-12 21:06:25 -0800
committerPalmer Truelson <palmer@lindenlab.com>2010-02-12 21:06:25 -0800
commit3b8463f0fd5f0b2cd54840c34a7a7e303954f768 (patch)
treea8c303cc592266109b368a4ae6093e8d2c3cf10f /indra/newview/llviewerobject.cpp
parent660c3b182c12ce0842334127782abc7c3cfba860 (diff)
parent1f672990e796ec55f7b684dbf46f939d1ab15607 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b5642d07a5..d0afa9d9de 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2001,9 +2001,6 @@ 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.