summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-16 22:09:49 -0800
committerDon Kjer <don@lindenlab.com>2010-12-16 22:09:49 -0800
commit14e402cf5e8274caddaf1c763c2e044c53514b1e (patch)
tree8acd92750135358bf8827d6e30ba1a5e57c89b58 /indra/newview/llviewerobjectlist.cpp
parent84516e337d887bf871e361bfebfce2695e8f443c (diff)
ER-414: Add object update type debug rendering view
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rw-r--r--indra/newview/llviewerobjectlist.cpp36
1 files changed, 5 insertions, 31 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 70631f9481..77fbc08ca4 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -564,10 +564,12 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
processUpdateCore(objectp, user_data, i, update_type, &compressed_dp, justCreated);
if (update_type != OUT_TERSE_IMPROVED) // OUT_FULL_COMPRESSED only?
{
- LLViewerRegion::eCacheUpdateResult result = objectp->mRegionp->cacheFullUpdate(objectp, compressed_dp);
bCached = true;
#if LL_RECORD_VIEWER_STATS
+ LLViewerRegion::eCacheUpdateResult result = objectp->mRegionp->cacheFullUpdate(objectp, compressed_dp);
LLViewerStatsRecorder::instance()->recordCacheFullUpdate(local_id, update_type, result, objectp);
+ #else
+ objectp->mRegionp->cacheFullUpdate(objectp, compressed_dp);
#endif
}
}
@@ -586,37 +588,9 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
}
#if LL_RECORD_VIEWER_STATS
LLViewerStatsRecorder::instance()->recordObjectUpdateEvent(local_id, update_type, objectp);
- F32 color_strength = llmin(((LLViewerStatsRecorder::instance()->getTimeSinceStart() / 1000.0f) + 128.0f) / 255.0f, 1.0f);
- LLColor4 color;
- switch (update_type)
- {
- case OUT_FULL:
- color[VGREEN] = color_strength;
- break;
- case OUT_TERSE_IMPROVED:
- color[VGREEN] = color_strength;
- color[VBLUE] = color_strength;
- break;
- case OUT_FULL_COMPRESSED:
- color[VRED] = color_strength;
- if (!bCached)
- {
- color[VGREEN] = color_strength;
- }
- break;
- case OUT_FULL_CACHED:
- color[VBLUE] = color_strength;
- break;
- default:
- llwarns << "Unknown update_type " << update_type << llendl;
- break;
- };
- U8 te;
- for (te = 0; te < objectp->getNumTEs(); ++te)
- {
- objectp->setTEColor(te, color);
- }
#endif
+ objectp->setLastUpdateType(update_type);
+ objectp->setLastUpdateCached(bCached);
}
#if LL_RECORD_VIEWER_STATS