diff options
| author | Richard Linden <none@none> | 2013-03-21 17:26:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-21 17:26:43 -0700 |
| commit | 0c63f95b9e1368607126b8d2edbcd91172e61db5 (patch) | |
| tree | ac99275d1d4f9d4dc1a38ac24e9b5601af1352a0 /indra | |
| parent | 1f507c3cfca0c7722ebeaf71883fbaa83988e1a9 (diff) | |
BUILDFIX fix for gcc build
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llcriticaldamp.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatersceneloadstats.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llfloatersceneloadstats.h | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/indra/llcommon/llcriticaldamp.cpp b/indra/llcommon/llcriticaldamp.cpp index 59a31bf9df..e47ab35641 100644 --- a/indra/llcommon/llcriticaldamp.cpp +++ b/indra/llcommon/llcriticaldamp.cpp @@ -116,5 +116,5 @@ F32 LLSmoothInterpolation::getInterpolant(LLUnit<LLUnits::Seconds, F32> time_con //----------------------------------------------------------------------------- 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/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 |