diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-10 16:05:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-10 16:05:53 +0200 |
| commit | c3d9aa60a799bb45b32c09870f92d576c9b571ce (patch) | |
| tree | 2fef4c4b45d63140535d46f61bd104b14ba8c920 /indra/newview/llvowater.cpp | |
| parent | 7dabb3c46e6cdf208ce7dc46b89f431a247d6ba6 (diff) | |
| parent | 93adff4569d66d0a8699615b7a21d789921ca15c (diff) | |
Merge from default branch
--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; |