summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparamset.h
diff options
context:
space:
mode:
authorsimon@lindenlab.com <simon@lindenlab.com>2011-07-07 17:46:18 -0700
committersimon@lindenlab.com <simon@lindenlab.com>2011-07-07 17:46:18 -0700
commit1cf5ce3a436297e0ac2293eacae7428f231fe1ec (patch)
tree4a074ab4bebd09ff53df696954f0f091cd48327c /indra/newview/llwaterparamset.h
parentf5bd2109c27b098dd73a9578f1f032b6ff9e4c2d (diff)
parent66dcc72870b19c6ada65a643ca33c779c9c9989b (diff)
Merge latest from viewer trunk
Diffstat (limited to 'indra/newview/llwaterparamset.h')
-rw-r--r--indra/newview/llwaterparamset.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llwaterparamset.h b/indra/newview/llwaterparamset.h
index 9957d5371b..b28585af59 100644
--- a/indra/newview/llwaterparamset.h
+++ b/indra/newview/llwaterparamset.h
@@ -34,7 +34,6 @@
#include "v4color.h"
#include "llviewershadermgr.h"
-class LLFloaterWater;
class LLWaterParamSet;
/// A class representing a set of parameter values for the Water shaders.