summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-21 19:07:48 -0700
committerRichard Linden <none@none>2013-03-21 19:07:48 -0700
commit368dd542bec7c31e14673b83d3342c35717d2920 (patch)
tree4d9270fad9cf7a491ec4b28b75dd7139a7dae840
parent0c63f95b9e1368607126b8d2edbcd91172e61db5 (diff)
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
fix for broken pause button on fast timer view
-rw-r--r--indra/llcommon/llcriticaldamp.cpp2
-rw-r--r--indra/llcommon/lltracerecording.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llcriticaldamp.cpp b/indra/llcommon/llcriticaldamp.cpp
index e47ab35641..2f013fe255 100644
--- a/indra/llcommon/llcriticaldamp.cpp
+++ b/indra/llcommon/llcriticaldamp.cpp
@@ -112,7 +112,7 @@ F32 LLSmoothInterpolation::getInterpolant(LLUnit<LLUnits::Seconds, F32> time_con
}
//-----------------------------------------------------------------------------
-// getInterpolant()
+// calcInterpolant()
//-----------------------------------------------------------------------------
F32 LLSmoothInterpolation::calcInterpolant(F32 time_constant)
{
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index 5d74ea32df..b70d42b082 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -133,6 +133,9 @@ Recording::Recording()
{}
Recording::Recording( const Recording& other )
+: RecordingBuffers(other),
+ mElapsedSeconds(other.mElapsedSeconds),
+ mSamplingTimer(other.mSamplingTimer)
{
LLStopWatchControlsMixin<Recording>::setPlayState(other.getPlayState());
}