Merge branch develop into 2025.06

# Conflicts:
#	indra/newview/llvoavatar.cpp

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index 8aed1c537e..63fb7d4a17 100644
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -275,6 +275,17 @@ 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
 };
 
 static const F32 SEND_STATS_PERIOD = 300.0f;