diff options
| author | Richard Linden <none@none> | 2013-05-30 19:00:08 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-30 19:00:08 -0700 |
| commit | ae6763f7fcfbe52ea1b04c25603ac2305beafb9d (patch) | |
| tree | fffe67ae8ce06af0e2c4ef0f874d140623efaa66 /indra/llcommon/lltracerecording.cpp | |
| parent | ee0087709afe05a9fe38e3da743421faead9e02f (diff) | |
| parent | ae355188327515d53b9c15c27ed576829fce3668 (diff) | |
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.sszl0v\ssh__richard@hg.lindenlab.com_richard_viewer-interesting_kkjl59.hg
Diffstat (limited to 'indra/llcommon/lltracerecording.cpp')
| -rw-r--r-- | indra/llcommon/lltracerecording.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp index 5b0b74524f..86cdca3e10 100644 --- a/indra/llcommon/lltracerecording.cpp +++ b/indra/llcommon/lltracerecording.cpp @@ -490,8 +490,9 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other ) { if (mAutoResize) { - for (S32 other_index = (other.mCurPeriod + 2) % other_recording_count; - other_index != other.mCurPeriod; + for (S32 other_index = (other.mCurPeriod + 2) % other_recording_count, + end_index = (other.mCurPeriod + 1) % other_recording_count; + other_index != end_index; other_index = (other_index + 1) % other_recording_count) { llassert(other.mRecordingPeriods[other_index].getDuration() != 0.f |