diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
| commit | ee66cb3efccd6976c5a7725620956ea7030b7b57 (patch) | |
| tree | 7ae469e4d2aac985589e7df902959b27c603b2ad /indra/newview/llviewerassetstats.h | |
| parent | 5ef8372e433896be174d7123bd4663087601a0df (diff) | |
| parent | 3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff) | |
merge back beta tags
Diffstat (limited to 'indra/newview/llviewerassetstats.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerassetstats.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetstats.h b/indra/newview/llviewerassetstats.h index 73ec5974b2..8319752230 100644..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 @@ -181,6 +182,9 @@ public: // Frames-Per-Second Samples void recordFPS(F32 fps); + // Avatar-related statistics + void recordAvatarStats(); + // Merge a source instance into a destination instance. This is // conceptually an 'operator+=()' method: // - counts are added @@ -252,6 +256,10 @@ protected: // Time of last reset duration_t mResetTimestamp; + + // Nearby avatar stats + std::vector<S32> mAvatarRezStates; + LLViewerStats::phase_stats_t mPhaseStats; }; @@ -310,6 +318,7 @@ void record_response_main(LLViewerAssetType::EType at, bool with_http, bool is_t void record_fps_main(F32 fps); +void record_avatar_stats(); /** * Region context, event and duration loggers for Thread 1. |