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.cpp | |
| parent | b1297dce44ccf4b4875ec9ce0d9d78d563d877ee (diff) | |
SH-4377 FIX: Interesting: Windows viewer crashes when SceneLoadingMonitorEnabled is enabled
Diffstat (limited to 'indra/llcommon/lltraceaccumulators.cpp')
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp index 42f075a7cb..ae769350b9 100644 --- a/indra/llcommon/lltraceaccumulators.cpp +++ b/indra/llcommon/lltraceaccumulators.cpp @@ -145,7 +145,7 @@ void SampleAccumulator::addSamples( const SampleAccumulator& other, EBufferAppen F64 epsilon = 0.0000001; - if (other.mTotalSamplingTime > epsilon) + if (other.mTotalSamplingTime > epsilon && mTotalSamplingTime > epsilon) { // combine variance (and hence standard deviation) of 2 different sized sample groups using // the following formula: http://www.mrc-bsu.cam.ac.uk/cochrane/handbook/chapter_7/7_7_3_8_combining_groups.htm @@ -173,7 +173,6 @@ void SampleAccumulator::addSamples( const SampleAccumulator& other, EBufferAppen mNumSamples += other.mNumSamples; mTotalSamplingTime += other.mTotalSamplingTime; mMean = (mMean * weight) + (other.mMean * (1.0 - weight)); - llassert(mMean < 0 || mMean >= 0); } if (append_type == SEQUENTIAL) { |