summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-11 14:18:36 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-11 14:18:36 -0800
commit9f8959d480d1069f554c576a4cc9a494559ef1e4 (patch)
tree7ae4f550c1039cdb15d0087a0511310dddf8b5a5 /indra/newview/llviewerobjectlist.cpp
parentd16757545c91d4f7dac3c52a311ad0f0239052e1 (diff)
parent573ab07a40acc78e28ae390331d862d3f858bb07 (diff)
Pull merge from viewer-chui
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rw-r--r--indra/newview/llviewerobjectlist.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 3eeab0bf3e..489c4107bb 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -948,7 +948,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
std::vector<LLViewerObject*>::iterator idle_end = idle_list.begin()+idle_count;
if (gSavedSettings.getBOOL("FreezeTime"))
- {
+ {
for (std::vector<LLViewerObject*>::iterator iter = idle_list.begin();
iter != idle_end; iter++)
@@ -969,14 +969,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();
- }
+ }