diff options
| -rw-r--r-- | indra/llcommon/llcriticaldamp.cpp | 4 | ||||
| -rw-r--r-- | indra/llcommon/lltracerecording.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloatersceneloadstats.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llfloatersceneloadstats.h | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/indra/llcommon/llcriticaldamp.cpp b/indra/llcommon/llcriticaldamp.cpp index 59a31bf9df..2f013fe255 100644 --- a/indra/llcommon/llcriticaldamp.cpp +++ b/indra/llcommon/llcriticaldamp.cpp @@ -112,9 +112,9 @@ F32 LLSmoothInterpolation::getInterpolant(LLUnit<LLUnits::Seconds, F32> time_con } //----------------------------------------------------------------------------- -// getInterpolant() +// calcInterpolant() //----------------------------------------------------------------------------- F32 LLSmoothInterpolation::calcInterpolant(F32 time_constant) { - return llclamp(1.f - pow(2.f, -sTimeDelta / time_constant), 0.f, 1.f); + return llclamp(1.f - powf(2.f, -sTimeDelta / time_constant), 0.f, 1.f); } 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()); } diff --git a/indra/newview/llfloatersceneloadstats.cpp b/indra/newview/llfloatersceneloadstats.cpp index 95e8fbf4dd..8aa93eae96 100644 --- a/indra/newview/llfloatersceneloadstats.cpp +++ b/indra/newview/llfloatersceneloadstats.cpp @@ -32,6 +32,9 @@ LLFloaterSceneLoadStats::LLFloaterSceneLoadStats( const LLSD& key ) : LLFloater(key) -{ +{} +BOOL LLFloaterSceneLoadStats::postBuild() +{ + return TRUE; } diff --git a/indra/newview/llfloatersceneloadstats.h b/indra/newview/llfloatersceneloadstats.h index 095541f2f6..aa414bf544 100644 --- a/indra/newview/llfloatersceneloadstats.h +++ b/indra/newview/llfloatersceneloadstats.h @@ -34,6 +34,10 @@ class LLFloaterSceneLoadStats : public LLFloater friend class LLFloaterReg; private: LLFloaterSceneLoadStats(const LLSD& key); + +public: + BOOL postBuild(); + }; #endif // LL_FLOATERSCENELOADSTATS_H |