diff options
| author | Richard Linden <none@none> | 2013-08-23 15:35:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-23 15:35:45 -0700 |
| commit | e30b03198cf35496e691e601ef3167ca44229116 (patch) | |
| tree | 8a3b076db5081fcf9fa3d298e24a37f35426c60c /indra/llcommon/lltraceaccumulators.cpp | |
| parent | 4c7f4896290707c833f5e088963c94ff5e01acde (diff) | |
| parent | b667d20e00e4ea5f1d5a619d2868b502583deb43 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltraceaccumulators.cpp')
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp index 5e25ad6b26..42f075a7cb 100644 --- a/indra/llcommon/lltraceaccumulators.cpp +++ b/indra/llcommon/lltraceaccumulators.cpp @@ -192,7 +192,7 @@ void SampleAccumulator::reset( const SampleAccumulator* other ) mMin = mLastValue; mMax = mLastValue; mMean = mLastValue; - LL_ERRS_IF(mHasValue && !(mMean < 0) && !(mMean >= 0)) << "Invalid mean after capturing value" << LL_ENDL; + llassert(!mHasValue || mMean < 0 || mMean >= 0); mSumOfSquares = 0; mLastSampleTimeStamp = LLTimer::getTotalSeconds(); mTotalSamplingTime = 0; |