diff options
author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-10 17:03:48 +0200 |
---|---|---|
committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-10 17:03:48 +0200 |
commit | ebfb32f35bfeb796b4971f66bd1a9ebdf88be854 (patch) | |
tree | 12a2fd956a69147758226f49a437a137f065410f /indra/newview/llvowater.cpp | |
parent | 15372bbc342a7b4c7a8d9b2e1bedd52655232ba7 (diff) | |
parent | 5377f8628e7f3eda9f497db1c367099ca04726d0 (diff) |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rw-r--r-- | indra/newview/llvowater.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index e5ff62746e..a8c4625f6e 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -55,8 +55,6 @@ const BOOL gUseRoam = FALSE; /////////////////////////////////// -#include "randgauss.h" - template<class T> inline T LERP(T a, T b, F32 factor) { return a + (b - a) * factor; |