summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstats.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-09 17:57:50 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-09 17:57:50 -0400
commite4cced82343391292e61db03bb019e19827834c7 (patch)
treea9f737b1c64b9a60ade9c4296d0afd8bf3e1b96a /indra/newview/llviewerassetstats.h
parent7d739fbe5b5f53fdc9dc5bfc1358906cca44fc05 (diff)
SH-3064 FIX - added cloud and cloud-or-gray stats to summary metrics. Moved summary metrics out of per-region info. Removed phase stats from avatar appearance change msg.
Diffstat (limited to 'indra/newview/llviewerassetstats.h')
-rwxr-xr-xindra/newview/llviewerassetstats.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llviewerassetstats.h b/indra/newview/llviewerassetstats.h
index 6cb0cc4060..4b278bc2a2 100755
--- a/indra/newview/llviewerassetstats.h
+++ b/indra/newview/llviewerassetstats.h
@@ -36,6 +36,7 @@
#include "llviewerassetstorage.h"
#include "llsimplestat.h"
#include "llsd.h"
+#include "llvoavatar.h"
/**
* @class LLViewerAssetStats
@@ -125,8 +126,7 @@ public:
mRegionHandle(src.mRegionHandle),
mTotalTime(src.mTotalTime),
mStartTimestamp(src.mStartTimestamp),
- mFPS(src.mFPS),
- mAvatarRezStates(src.mAvatarRezStates)
+ mFPS(src.mFPS)
{
for (int i = 0; i < LL_ARRAY_SIZE(mRequests); ++i)
{
@@ -149,7 +149,6 @@ public:
duration_t mTotalTime;
duration_t mStartTimestamp;
LLSimpleStatMMM<> mFPS;
- std::vector<S32> mAvatarRezStates;
struct prs_group
{
@@ -257,6 +256,10 @@ protected:
// Time of last reset
duration_t mResetTimestamp;
+
+ // Nearby avatar stats
+ std::vector<S32> mAvatarRezStates;
+ LLVOAvatar::phase_stats_t mPhaseStats;
};