summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-09 17:57:56 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-09 17:57:56 +0000
commit5a9e551c246280077f966933e07024696cbcc53f (patch)
tree220a9f7e0853b10b76bb3e15550598f83c6072ab /indra/newview/llvowater.cpp
parentc9937716aa3a1f7aac0e93fc1d58488d02d30e6e (diff)
parent0777c177525c8ff2889e9cd5f06877de3c5f9f31 (diff)
merge.
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rw-r--r--indra/newview/llvowater.cpp2
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;