summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparammanager.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-16 16:40:06 -0800
committerJames Cook <james@lindenlab.com>2009-12-16 16:40:06 -0800
commit3c06dc4df2d9ee11e7d346f902d34eaee17161a5 (patch)
tree40c5342da322116d093268e0437736f860d62e0d /indra/newview/llwaterparammanager.cpp
parent4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (diff)
parentc08699f900bf1560f61ea05e44449e90bb02c708 (diff)
Merge
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
-rw-r--r--indra/newview/llwaterparammanager.cpp3
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"