diff options
| author | Richard Linden <none@none> | 2013-08-19 10:20:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-19 10:20:55 -0700 |
| commit | 08eb52c10ca1f916d937fe1927eb659f6d69a6d3 (patch) | |
| tree | 98e7faecca7ded1dd8732dfef7c13abd424b858b /indra/llcommon/llcriticaldamp.h | |
| parent | 4290365ebbf5505bee4fbed8043996fa7687fd03 (diff) | |
| parent | 612892b45a3413b16e40c49d3bfde77a4ca927fd (diff) | |
merge
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 7b2a414459..a02a2a0dcf 100755 --- a/indra/llcommon/llcriticaldamp.h +++ b/indra/llcommon/llcriticaldamp.h @@ -42,10 +42,10 @@ public: static void updateInterpolants(); // ACCESSORS - static F32 getInterpolant(LLUnitImplicit<F32, LLUnits::Seconds> time_constant, bool use_cache = true); + static F32 getInterpolant(F32SecondsImplicit time_constant, bool use_cache = true); template<typename T> - static T lerp(T a, T b, LLUnitImplicit<F32, LLUnits::Seconds> time_constant, bool use_cache = true) + static T lerp(T a, T b, F32SecondsImplicit time_constant, bool use_cache = true) { F32 interpolant = getInterpolant(time_constant, use_cache); return ((a * (1.f - interpolant)) |