summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-11-19 16:49:24 -0800
committerDave SIMmONs <simon@lindenlab.com>2010-11-19 16:49:24 -0800
commit0dce88bc92cfb1ebebb575087ca950a6d5363c0c (patch)
tree849a86e71256243375f9e4dcbd214b551cc44f2a /indra/newview/llviewerobjectlist.cpp
parent2eec4949cc49f3c59cdc278be0e7eed1e092b167 (diff)
ER-330 : Improve ObjectUpdateCached message packing. Added some viewer metrics, will disable later.
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rw-r--r--indra/newview/llviewerobjectlist.cpp21
1 files changed, 20 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index f5a32438cf..d14fd69348 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -56,6 +56,7 @@
#include "llresmgr.h"
#include "llviewerregion.h"
#include "llviewerstats.h"
+#include "llviewerstatsrecorder.h"
#include "llvoavatarself.h"
#include "lltoolmgr.h"
#include "lltoolpie.h"
@@ -345,7 +346,13 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
U8 compressed_dpbuffer[2048];
LLDataPackerBinaryBuffer compressed_dp(compressed_dpbuffer, 2048);
LLDataPacker *cached_dpp = NULL;
-
+
+#if LL_RECORD_VIEWER_STATS
+ static LLViewerStatsRecorder stats_recorder;
+ stats_recorder.initStatsRecorder(regionp);
+ stats_recorder.initCachedObjectUpdate(regionp);
+#endif
+
for (i = 0; i < num_objects; i++)
{
LLTimer update_timer;
@@ -369,6 +376,10 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
}
else
{
+ #if LL_RECORD_VIEWER_STATS
+ stats_recorder.recordCachedObjectEvent(regionp, id, NULL);
+ #endif
+
continue; // no data packer, skip this object
}
}
@@ -540,6 +551,10 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
{
objectp->mLocalID = local_id;
processUpdateCore(objectp, user_data, i, update_type, cached_dpp, justCreated);
+
+ #if LL_RECORD_VIEWER_STATS
+ stats_recorder.recordCachedObjectEvent(regionp, local_id, objectp);
+ #endif
}
else
{
@@ -551,6 +566,10 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
}
}
+#if LL_RECORD_VIEWER_STATS
+ stats_recorder.closeCachedObjectUpdate(regionp);
+#endif
+
LLVOAvatar::cullAvatarsByPixelArea();
}