diff options
| author | Richard Linden <none@none> | 2013-09-27 15:51:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-27 15:51:40 -0700 |
| commit | 0e29315ec701583455a109e85221f62ee68225ca (patch) | |
| tree | b2f2a4a5bbb4af34e8804b11c9697246089106d3 /indra/llcommon | |
| parent | 2fad2cc7365803b63bfe2466da2558182a1c25b9 (diff) | |
BUILDFIX: fix for bad assert causing unit tests to fail
Diffstat (limited to 'indra/llcommon')
| -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 4fe84455a6..07870c5340 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]; |