diff options
| author | Richard Linden <none@none> | 2013-05-31 16:59:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-31 16:59:00 -0700 |
| commit | 72641a933500f1b1156bd3006c6a227e7fa3567c (patch) | |
| tree | 5921e697f526fbba46daa4e971c167087c37fea6 /indra/llcommon/lltracerecording.cpp | |
| parent | f6c5a4057d1154e590ee630cb8254879a1f426e4 (diff) | |
| parent | 9def3590f41dee3cba7760e4443fdc71f5fb2db6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
Diffstat (limited to 'indra/llcommon/lltracerecording.cpp')
| -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 3994e4f521..e45639a034 100644 --- a/indra/llcommon/lltracerecording.cpp +++ b/indra/llcommon/lltracerecording.cpp @@ -538,7 +538,7 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other ) other.setPlayState(other_play_state); } -LLUnit<LLUnits::Seconds, F64> PeriodicRecording::getDuration() +LLUnit<LLUnits::Seconds, F64> PeriodicRecording::getDuration() const { LLUnit<LLUnits::Seconds, F64> duration; size_t num_periods = mRecordingPeriods.size(); |