Start viewer/common split

1 files changed, 16 insertions, 7 deletions

diff --git a/indra/newview/llsettingswater.h b/indra/newview/llsettingswater.h
index a62fa355de..aa60861bd4 100644
--- a/indra/newview/llsettingswater.h
+++ b/indra/newview/llsettingswater.h
@@ -203,14 +203,12 @@ public:
 protected:
     LLSettingsWater();
 
-    virtual void        updateSettings();
-
     virtual parammapping_t getParameterMap() const;
 
-    virtual void        applySpecial(void *);
-
     virtual validation_list_t getValidationList() const;
 
+    LLVector4           mWaterPlane;
+    F32                 mWaterFogKS;
 private:
     static const std::string SETTING_LEGACY_BLUR_MULTIPILER;
     static const std::string SETTING_LEGACY_FOG_COLOR;
@@ -224,11 +222,22 @@ private:
     static const std::string SETTING_LEGACY_SCALE_BELOW;
     static const std::string SETTING_LEGACY_WAVE1_DIR;
     static const std::string SETTING_LEGACY_WAVE2_DIR;
+};
+
+class LLSettingsVOWater : public LLSettingsWater
+{
+public:
+    LLSettingsVOWater(const LLSD &data);
 
-    static const F32    WATER_FOG_LIGHT_CLAMP;
+protected:
+    LLSettingsVOWater();
+
+    virtual void updateSettings();
+    virtual void applySpecial(void *);
+
+private:
+    static const F32 WATER_FOG_LIGHT_CLAMP;
 
-    LLVector4           mWaterPlane;
-    F32                 mWaterFogKS;
 };
 
 #endif