diff options
| author | Richard Linden <none@none> | 2012-10-10 20:15:21 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-10-10 20:15:21 -0700 |
| commit | b3107e37643743118840d3f5437e62196bae3581 (patch) | |
| tree | af6cbc569e7912303da6dbc3146fe9a1a229f992 /indra/newview/llviewerstats.h | |
| parent | 05510799e5a69eafcc919e72d25cf5b89c9274cf (diff) | |
| parent | 74ac0182ec8f7a0f6d0ea89f5814f0998ab90b62 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerstats.h')
| -rwxr-xr-x | indra/newview/llviewerstats.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h index af2e915994..a14518f536 100755 --- a/indra/newview/llviewerstats.h +++ b/indra/newview/llviewerstats.h @@ -1,5 +1,5 @@ /** - * @file llviewerstats.h + * @file llviewerim_peningtats.h * @brief LLViewerStats class header file * * $LicenseInfo:firstyear=2002&license=viewerlgpl$ @@ -97,7 +97,8 @@ extern LLTrace::Measurement<F32> SIM_TIME_DILATION, SIM_OUT_PACKETS_PER_SEC, SIM_PENDING_DOWNLOADS, SIM_PENDING_UPLOADS, - SIM_PENING_LOCAL_UPLOADS, + SIM_PENDING_LOCAL_UPLOADS, + SIM_PENDING_VFS_OPERATIONS, SIM_PHYSICS_PINNED_TASKS, SIM_PHYSICS_LOD_TASKS, NUM_IMAGES, @@ -138,6 +139,8 @@ extern LLTrace::Measurement<LLUnits::Seconds<F32> > SIM_PHYSICS_TIME, SIM_SLEEP_TIME, SIM_PUMP_IO_TIME, SIM_PING, + FRAMETIME_JITTER, + FRAMETIME_SLEW, LOGIN_SECONDS, REGION_CROSSING_TIME, FRAME_STACKTIME, @@ -409,10 +412,12 @@ public: }; LLTrace::Recording& getRecording() { return mRecording; } + LLTrace::Recording& getFrameRecording() { return mFrameRecording; } private: F64 mStats[ST_COUNT]; LLTrace::Recording mRecording; + LLTrace::Recording mFrameRecording; F64 mLastTimeDiff; // used for time stat updates }; |