1 files changed, 27 insertions, 0 deletions

diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index 1df2084..3561a91 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -37,6 +37,21 @@
 struct Meta7WindlightPacket;
 
 
+typedef enum wl_scope
+{
+        WL_SCOPE_USER,
+        WL_SCOPE_REGION,
+        WL_SCOPE_PARCEL,
+        WL_SCOPE_RLV
+} WLScope;
+
+struct WLCombined
+{
+        LLWaterParamSet water;
+        LLWLParamSet sky;
+        BOOL enabled;
+};
+
 // Encapsulates a "Windlight" (LightShare) message sent from the
 // region, allowing the settings to be applied at a later time.
 //
@@ -51,6 +66,13 @@ public:
                 LIGHTSHARE_ALWAYS = 2,
         };
 
+        // The name of the preset where the region settings are stored.
+        static const std::string sRegionPresetName;
+        // The name of the preset where the parcel settings are stored.
+        static const std::string sParcelPresetName;
+        // The name of the preset where the RLV settings are stored.
+        static const std::string sRLVPresetName;
+
         // Constructs a new LightShare instance from a GenericMessage
         // with the "Windlight" method, such as those sent by a
         // Lightshare-enabled OpenSim region.
@@ -72,6 +94,8 @@ public:
         // (But there's no real validation yet, so this is always true.)
         bool isValid();
 
+        static void apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky, WLScope scope);
+
 private:
         static LLTimer* sIgnoreTimer;
         static bool sIgnoreRegion;
@@ -100,6 +124,9 @@ private:
         // Returns true if the ignore timer has expired (i.e. new settings
         // should not be ignored anymore).
         static bool ignoreTimerHasExpired();
+
+        static void mergeWaterSets(LLWaterParamSet* thisSet, LLWaterParamSet* oldSet);
+        static void mergeWLSets(LLWLParamSet* thisSet, LLWLParamSet* oldSet);
 };
 
 #endif