diff options
| author | Richard Linden <none@none> | 2013-09-27 16:59:54 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-27 16:59:54 -0700 |
| commit | 7d635773dddb5ebc42a4c3eeae84a35055fea537 (patch) | |
| tree | 48e073866ac520fd861ea7e3b79d793b24b6738a /indra | |
| parent | 35b591a47d71212e3b2c1b7eaca797d6927bde42 (diff) | |
| parent | 0e29315ec701583455a109e85221f62ee68225ca (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h index 2dcfdf48ad..3c11509dd1 100644 --- a/indra/llcommon/lltraceaccumulators.h +++ b/indra/llcommon/lltraceaccumulators.h @@ -95,7 +95,7 @@ namespace LLTrace void addSamples(const AccumulatorBuffer<ACCUMULATOR>& other, EBufferAppendType append_type) { - llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize > sNextStorageSlot); + llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot); for (size_t i = 0; i < sNextStorageSlot; i++) { mStorage[i].addSamples(other.mStorage[i], append_type); @@ -104,7 +104,7 @@ namespace LLTrace void copyFrom(const AccumulatorBuffer<ACCUMULATOR>& other) { - llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize > sNextStorageSlot); + llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot); for (size_t i = 0; i < sNextStorageSlot; i++) { mStorage[i] = other.mStorage[i]; |