diff options
| author | Richard Linden <none@none> | 2013-07-19 15:03:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-19 15:03:05 -0700 |
| commit | e40065f82c797eab41006a448c838f4f1089a2e8 (patch) | |
| tree | 7abaeeae98304308bc3812531f682de3cda4bb72 /indra/llcommon/llcriticaldamp.h | |
| parent | eb8d552df76540e7b0b533f0c10c5faa541299a4 (diff) | |
BUILDFIX: #include and dependency cleanup
Diffstat (limited to 'indra/llcommon/llcriticaldamp.h')
| -rwxr-xr-x | indra/llcommon/llcriticaldamp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llcriticaldamp.h b/indra/llcommon/llcriticaldamp.h index e174643cd0..7b2a414459 100755 --- a/indra/llcommon/llcriticaldamp.h +++ b/indra/llcommon/llcriticaldamp.h @@ -42,10 +42,10 @@ public: static void updateInterpolants(); // ACCESSORS - static F32 getInterpolant(LLUnit<F32, LLUnits::Seconds> time_constant, bool use_cache = true); + static F32 getInterpolant(LLUnitImplicit<F32, LLUnits::Seconds> time_constant, bool use_cache = true); template<typename T> - static T lerp(T a, T b, LLUnit<F32, LLUnits::Seconds> time_constant, bool use_cache = true) + static T lerp(T a, T b, LLUnitImplicit<F32, LLUnits::Seconds> time_constant, bool use_cache = true) { F32 interpolant = getInterpolant(time_constant, use_cache); return ((a * (1.f - interpolant)) |