Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac

1 files changed, 20 insertions, 0 deletions

diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index 8aed1c537e..011269d7ee 100644
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -271,10 +271,30 @@ public:
     LLTrace::Recording& getRecording() { return mRecording; }
     const LLTrace::Recording& getRecording() const { return mRecording; }
 
+    F64 getLastNormalizedSessionJitter() const { return mLastNoramlizedSessionJitter; }
+    F64 getLastNormalizedFrametimeVariance() const { return mLastNormalizedFrametimeVariance; }
+    F64 getLastNormalizedPeriodJitter() const { return mLastNormalizedPeriodJitter; }
+
 private:
     LLTrace::Recording              mRecording;
 
     F64Seconds mLastTimeDiff;  // used for time stat updates
+    F64Seconds mTotalFrametimeJitter;
+
+    U32 mFrameJitterEvents = 0;
+    U32 mFrameJitterEventsLastMinute = 0;
+    U32 mEventMinutes = 0;
+    F64Seconds mTotalTime;
+
+    F64Seconds              mLastFrameTimeSample; // used for frame time stats
+    F64Seconds              mTimeSinceLastEventSample;
+    std::vector<F64Seconds>      mFrameTimes;          // used for frame time stats
+    std::vector<F64Seconds> mFrameTimesJitter;    // used for frame time jitter stats
+
+    F64 mLastNoramlizedSessionJitter; // used for frame time jitter stats
+    F64 mLastNormalizedFrametimeVariance; // Used when submitting jitter stats
+    F64 mLastNormalizedPeriodJitter;
+
 };
 
 static const F32 SEND_STATS_PERIOD = 300.0f;