diff options
| author | Richard Linden <none@none> | 2013-10-01 13:47:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-01 13:47:15 -0700 |
| commit | 9e486f6c6abbee6cb41ba9a6271d8a025ad924ef (patch) | |
| tree | e6a8d1de4fc9fa4e8eff575d4ab430f7a72a4170 /indra/llcommon/lltraceaccumulators.cpp | |
| parent | 1aa9ad575488eb1f808f3bfcb5f0ffa1e8e95591 (diff) | |
| parent | 12f0f8cb72f789e21b01b45063dcc5f1f5292087 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltraceaccumulators.cpp')
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp index a7bd04415e..f5f2e7df1c 100644 --- a/indra/llcommon/lltraceaccumulators.cpp +++ b/indra/llcommon/lltraceaccumulators.cpp @@ -125,6 +125,11 @@ void AccumulatorBufferGroup::sync() void SampleAccumulator::addSamples( const SampleAccumulator& other, EBufferAppendType append_type ) { + if (append_type == NON_SEQUENTIAL) + { + return; + } + if (!mHasValue) { *this = other; |