diff options
| author | Richard Linden <none@none> | 2013-08-29 15:20:20 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-29 15:20:20 -0700 |
| commit | e2212f86338728622651619f52e894f265aa320a (patch) | |
| tree | 4c641f1adb2c5117dece48b7ec839aacba035f82 /indra/llcommon/lltraceaccumulators.h | |
| parent | b1297dce44ccf4b4875ec9ce0d9d78d563d877ee (diff) | |
SH-4377 FIX: Interesting: Windows viewer crashes when SceneLoadingMonitorEnabled is enabled
Diffstat (limited to 'indra/llcommon/lltraceaccumulators.h')
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h index e0f60800e3..02af480b8a 100644 --- a/indra/llcommon/lltraceaccumulators.h +++ b/indra/llcommon/lltraceaccumulators.h @@ -318,7 +318,6 @@ namespace LLTrace mMin = value; mMax = value; mMean = value; - llassert(mMean < 0 || mMean >= 0); mLastSampleTimeStamp = time_stamp; } else @@ -336,15 +335,13 @@ namespace LLTrace void sync(F64SecondsImplicit time_stamp) { - if (mHasValue) + if (mHasValue && time_stamp != mLastSampleTimeStamp) { F64SecondsImplicit delta_time = time_stamp - mLastSampleTimeStamp; mSum += mLastValue * delta_time; mTotalSamplingTime += delta_time; F64 old_mean = mMean; - llassert(mMean < 0 || mMean >= 0); mMean += (delta_time / mTotalSamplingTime) * (mLastValue - old_mean); - llassert(mMean < 0 || mMean >= 0); mSumOfSquares += delta_time * (mLastValue - old_mean) * (mLastValue - mMean); } mLastSampleTimeStamp = time_stamp; |