diff options
author | Dave Parks <davep@lindenlab.com> | 2009-12-18 13:24:29 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2009-12-18 13:24:29 -0600 |
commit | 6aa71844a8949ab3c75b6cbe1a5f8cb811aa27b8 (patch) | |
tree | e73b1d2847a33c7568688f85265913a69d1711a2 /indra/newview/llwaterparammanager.cpp | |
parent | 5015886e1763887f534321790d56b6cee5a75dfa (diff) | |
parent | d5b53eb483ec042d83859ec957dce7699c7469aa (diff) |
Merge with viewer-2-0
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" |