From 0c63f95b9e1368607126b8d2edbcd91172e61db5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 21 Mar 2013 17:26:43 -0700
Subject: [PATCH] BUILDFIX fix for gcc build
---
indra/llcommon/llcriticaldamp.cpp | 2 +-
indra/newview/llfloatersceneloadstats.cpp | 5 ++++-
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 59a31bf9dfd..e47ab356412 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 95e8fbf4dda..8aa93eae96c 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 095541f2f6a..aa414bf5448 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
--
GitLab