diff options
author | Richard Linden <none@none> | 2013-06-19 20:35:13 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-06-19 20:35:13 -0700 |
commit | 1c51938babfa8c55c61b6b4cda34a7d22c1a427a (patch) | |
tree | 577512ee4877f52accadca7c2694c8fdb5ef2db2 /indra | |
parent | 3fe19d883d2856cd7d104810b794eee82d642a3e (diff) |
BUILDFIX: size_t/u32 confusion
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llcommon/lltracerecording.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp index 0fe95ee75f..d34434f161 100644 --- a/indra/llcommon/lltracerecording.cpp +++ b/indra/llcommon/lltracerecording.cpp @@ -464,7 +464,7 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other ) } else { - size_t num_to_copy = llmin( mRecordingPeriods.size(), other_num_recordings); + size_t num_to_copy = llmin( mRecordingPeriods.size(), (size_t)other_num_recordings); std::vector<Recording>::iterator src_it = other.mRecordingPeriods.begin() + other_index ; std::vector<Recording>::iterator dest_it = mRecordingPeriods.begin() + mCurPeriod; |