5 files changed, 0 insertions, 19 deletions

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index af3e84fd0f..ec26959718 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -67,7 +67,6 @@ const U32 LLSettingsBase::Validator::VALIDATION_PARTIAL(0x01 << 0);
 LLSettingsBase::LLSettingsBase():
     mSettings(LLSD::emptyMap()),
     mDirty(true),
-    mAssetID(),
     mBlendedFactor(0.0)
 {
 }
@@ -75,7 +74,6 @@ LLSettingsBase::LLSettingsBase():
 LLSettingsBase::LLSettingsBase(const LLSD setting) :
     mSettings(setting),
     mDirty(true),
-    mAssetID(),
     mBlendedFactor(0.0)
 {
 }
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 26e2901968..56e28fc899 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -359,7 +359,6 @@ protected:
 
     LLSD        mSettings;
     bool        mIsValid;
-    LLAssetID   mAssetID;
 
     LLSD        cloneSettings() const;
 
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index 8776f6725d..f7f5bb63b6 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -146,8 +146,6 @@ private:
 
     LLSettingsBase::Seconds     mLastUpdateTime;
 
-    void                        parseFromLLSD(LLSD &data);
-
     static CycleTrack_t::iterator   getEntryAtOrBefore(CycleTrack_t &track, const LLSettingsBase::TrackPosition& keyframe);
     static CycleTrack_t::iterator   getEntryAtOrAfter(CycleTrack_t &track, const LLSettingsBase::TrackPosition& keyframe);
     TrackBound_t                    getBoundingEntries(CycleTrack_t &track, const LLSettingsBase::TrackPosition& keyframe);
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index b8c5648cca..c6d878769d 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2448,7 +2448,6 @@ LLEnvironment::DayInstance::DayInstance(EnvSelection_t env) :
     mBlenderSky(),
     mBlenderWater(),
     mInitialized(false),
-    mType(TYPE_INVALID),
     mSkyTrack(1),
     mEnv(env),
     mAnimateFlags(0)
@@ -2467,7 +2466,6 @@ LLEnvironment::DayInstance::ptr_t LLEnvironment::DayInstance::clone() const
     environment->mBlenderSky = mBlenderSky;
     environment->mBlenderWater = mBlenderWater;
     environment->mInitialized = mInitialized;
-    environment->mType = mType;
     environment->mSkyTrack = mSkyTrack;
     environment->mAnimateFlags = mAnimateFlags;
 
@@ -2491,7 +2489,6 @@ bool LLEnvironment::DayInstance::applyTimeDelta(const LLSettingsBase::Seconds& d
 
 void LLEnvironment::DayInstance::setDay(const LLSettingsDay::ptr_t &pday, LLSettingsDay::Seconds daylength, LLSettingsDay::Seconds dayoffset)
 {
-    mType = TYPE_CYCLED;
     mInitialized = false;
 
     mAnimateFlags = 0;
@@ -2512,7 +2509,6 @@ void LLEnvironment::DayInstance::setDay(const LLSettingsDay::ptr_t &pday, LLSett
 
 void LLEnvironment::DayInstance::setSky(const LLSettingsSky::ptr_t &psky)
 {
-    mType = TYPE_FIXED;
     mInitialized = false;
 
     bool different_sky = mSky != psky;
@@ -2532,7 +2528,6 @@ void LLEnvironment::DayInstance::setSky(const LLSettingsSky::ptr_t &psky)
 
 void LLEnvironment::DayInstance::setWater(const LLSettingsWater::ptr_t &pwater)
 {
-    mType = TYPE_FIXED;
     mInitialized = false;
 
     bool different_water = mWater != pwater;
@@ -2554,7 +2549,6 @@ void LLEnvironment::DayInstance::initialize()
 
 void LLEnvironment::DayInstance::clear()
 {
-    mType = TYPE_INVALID;
     mDayCycle.reset();
     mSky.reset();
     mWater.reset();
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 3ae1d37a8c..97cc3c8740 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -232,13 +232,6 @@ public:
     class DayInstance: public std::enable_shared_from_this<DayInstance>
     {
     public:
-        enum InstanceType_t
-        {
-            TYPE_INVALID,
-            TYPE_FIXED,
-            TYPE_CYCLED
-        };
-
         typedef std::shared_ptr<DayInstance> ptr_t;
 
         static const U32                NO_ANIMATE_SKY;
@@ -291,7 +284,6 @@ public:
         LLSettingsWater::ptr_t      mWater;
         S32                         mSkyTrack;
 
-        InstanceType_t              mType;
         bool                        mInitialized;
 
         LLSettingsDay::Seconds      mDayLength;