MAINT-8052: One more step towards parcel environments.

6 files changed, 17 insertions, 26 deletions

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index fb9d8de053..a35504e0e6 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -251,7 +251,7 @@ LLSD LLSettingsBase::getSettings() const
 
 LLSD LLSettingsBase::cloneSettings() const
 {
-    return combineSDMaps(mSettings, LLSD());
+    return combineSDMaps(getSettings(), LLSD());
 }
 
 size_t LLSettingsBase::getHash() const
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index b3cf53869f..4a7bc02871 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -84,25 +84,6 @@ public:
     static LLSD                 defaults();
 
     //---------------------------------------------------------------------
-    S64Seconds getDayLength() const
-    {
-        return mDayLength;
-    }
-
-    void setDayLength(S64Seconds seconds)
-    {
-        mDayLength = seconds;
-    }
-
-    S64Seconds getDayOffset() const
-    {
-        return mDayOffset;
-    }
-
-    void setDayOffset(S64Seconds seconds)
-    {
-        mDayOffset = seconds;
-    }
 
     KeyframeList_t              getTrackKeyframes(S32 track);
     TimeList_t                  getTrackTimes(S32 track);
@@ -139,6 +120,12 @@ public:
 
     virtual validation_list_t   getValidationList() const;
     static validation_list_t    validationList();
+
+    S64Seconds                  getDayLength() const { return mDayLength; }
+    void                        setDayLength(S64Seconds val ) { mDayLength = val; }
+    S64Seconds                  getDayOffset() const { return mDayOffset; }
+    void                        setDayOffset(S64Seconds val) { mDayOffset = val; }
+
 protected:
     LLSettingsDay();
 
@@ -157,8 +144,8 @@ private:
 
     F64Seconds                  mLastUpdateTime;
 
-    S64Seconds                  mDayLength; 
-    S64Seconds                  mDayOffset;
+    S64Seconds mDayLength;
+    S64Seconds mDayOffset;
 
     F32                         secondsToKeyframe(S64Seconds seconds);
     F64Seconds                  keyframeToSeconds(F32 keyframe);
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 14024cf4f7..c02d99fb67 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -270,6 +270,8 @@ LLSD LLSettingsSky::defaults()
     dfltsetting[SETTING_MOON_TEXTUREID]     = IMG_MOON; // gMoonTextureID;   // These two are returned by the login... wow!
     dfltsetting[SETTING_SUN_TEXUTUREID]     = IMG_SUN;  // gSunTextureID;
 
+    dfltsetting[SETTING_TYPE] = "sky";
+
     return dfltsetting;
 }
 
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index d36de571f6..9947ffc022 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -412,6 +412,8 @@ public:
     virtual validation_list_t getValidationList() const;
     static validation_list_t validationList();
 
+    static LLSD     translateLegacySettings(LLSD legacy);
+
 protected:
     static const std::string SETTING_LEGACY_EAST_ANGLE;
     static const std::string SETTING_LEGACY_ENABLE_CLOUD_SCROLL;
@@ -423,8 +425,6 @@ protected:
 
     virtual void    updateSettings();
 
-    static LLSD     translateLegacySettings(LLSD legacy);
-
 private:
     static const F32         NIGHTTIME_ELEVATION;
     static const F32         NIGHTTIME_ELEVATION_COS;
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index 67a9cd39cb..0fe3de44d3 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -100,6 +100,8 @@ LLSD LLSettingsWater::defaults()
     dfltsetting[SETTING_WAVE1_DIR] = LLVector2(1.04999f, -0.42000f).getValue();
     dfltsetting[SETTING_WAVE2_DIR] = LLVector2(1.10999f, -1.16000f).getValue();
 
+    dfltsetting[SETTING_TYPE] = "water";
+
     return dfltsetting;
 }
 
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h
index 94e5583fd7..4c61e2a34c 100644
--- a/indra/llinventory/llsettingswater.h
+++ b/indra/llinventory/llsettingswater.h
@@ -201,6 +201,8 @@ public:
     virtual validation_list_t getValidationList() const;
     static validation_list_t validationList();
 
+    static LLSD         translateLegacySettings(LLSD legacy);
+
 protected:
     static const std::string SETTING_LEGACY_BLUR_MULTIPILER;
     static const std::string SETTING_LEGACY_FOG_COLOR;
@@ -217,8 +219,6 @@ protected:
 
     LLSettingsWater();
 
-    static LLSD         translateLegacySettings(LLSD legacy);
-
     LLVector4           mWaterPlane;
     F32                 mWaterFogKS;