summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-03-25 11:12:52 -0700
committersimon <none@none>2013-03-25 11:12:52 -0700
commit98a82c50d539451e1931826ca75fbc01d611806d (patch)
tree3c3dcac20286246f0724c11f126233702f0bdaaf /indra/newview/llviewerobjectlist.cpp
parent94ae64d6fd30e4dbc3280cd277f772c038ccd9fe (diff)
parent515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff)
Pull in downstream CHUI code from viewer-development
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 54f9360b60..6d4de05ffe 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -952,14 +952,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();
- }
+ }