diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/newview/llvowater.h | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llvowater.h')
| -rw-r--r-- | indra/newview/llvowater.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h index e3df822037..f7b3e34f8d 100644 --- a/indra/newview/llvowater.h +++ b/indra/newview/llvowater.h @@ -12,9 +12,6 @@ #include "llviewerobject.h" #include "llviewerimage.h" #include "v2math.h" -#include "llfft.h" - -#include "llwaterpatch.h" const U32 N_RES = 16; //32 // number of subdivisions of wave tile const U8 WAVE_STEP = 8; |