summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-11 15:05:47 -0400
committerprep <prep@lindenlab.com>2013-03-11 15:05:47 -0400
commite0c9174609e2457fab7fe6d7291c6ebbd030397c (patch)
treea6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/newview/llviewerobjectlist.cpp
parent9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff)
parent207d9fd767895a3470722fb298eeef4f338e479a (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rw-r--r--indra/newview/llviewerobjectlist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 0561e731e7..11d34ad084 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -956,14 +956,14 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
llassert(objectp->isActive());
objectp->idleUpdate(agent, world, frame_time);
- }
+ }
//update flexible objects
LLVolumeImplFlexible::updateClass();
//update animated textures
LLViewerTextureAnim::updateClass();
- }
+ }