summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparammanager.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-02-04 16:38:26 -0800
committerMerov Linden <merov@lindenlab.com>2011-02-04 16:38:26 -0800
commit09b009fc23e75c8403cc9879f7f839d9e2656c02 (patch)
treeaa6e1d387821c1ea5906a7aa9b3dd474ece431b7 /indra/newview/llwaterparammanager.h
parent6371ce7727cfb26e5b4ab4ac59b0600cf23655c0 (diff)
STORM-610 : Backing out that change (test fail)
Diffstat (limited to 'indra/newview/llwaterparammanager.h')
-rw-r--r--indra/newview/llwaterparammanager.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h
index 20556926ab..c479f1861c 100644
--- a/indra/newview/llwaterparammanager.h
+++ b/indra/newview/llwaterparammanager.h
@@ -284,9 +284,6 @@ public:
// singleton pattern implementation
static LLWaterParamManager * instance();
-private:
- void initOverrides();
-
public:
LLWaterParamSet mCurParams;
@@ -317,9 +314,6 @@ private:
LLVector4 mWaterPlane;
F32 mWaterFogKS;
- LLColor4 mPrevFogColor;
- F32 mPrevFogDensity;
-
// our parameter manager singleton instance
static LLWaterParamManager * sInstance;
};