diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
| commit | 073ec70829723e54f822052fe9c6c3e998e8dfca (patch) | |
| tree | 3d7e782101a2284bcb0fcbf61273f8167d03544f /indra/newview/llwaterparammanager.cpp | |
| parent | 4d4406820b858d59be670f0ca03bdadefba61c53 (diff) | |
| parent | e7eae453908e77a959a2ef6fea272107491fe35e (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
| -rw-r--r-- | indra/newview/llwaterparammanager.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index 697fefee3a..8be8f494da 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -51,16 +51,13 @@ #include "llsdserialize.h" #include "v4math.h" -#include "llviewerdisplay.h" #include "llviewercontrol.h" -#include "llviewerwindow.h" #include "lldrawpoolwater.h" #include "llagent.h" #include "llviewerregion.h" #include "llwlparammanager.h" #include "llwaterparamset.h" -#include "llpostprocess.h" #include "llfloaterwater.h" #include "curl/curl.h" |