Merge

1 files changed, 0 insertions, 46 deletions

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 5abb1b2e55..994420a139 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -277,7 +277,6 @@ LLEnvironment::LLEnvironment():
     mSelectedSky(),
     mSelectedWater(),
     mSelectedDay(),
-    mUserPrefs(),
     mSelectedEnvironment(LLEnvironment::ENV_LOCAL),
     mCurrentTrack(1)
 {
@@ -309,16 +308,6 @@ LLEnvironment::~LLEnvironment()
 {
 }
 
-void LLEnvironment::loadPreferences()
-{
-    mUserPrefs.load();
-}
-
-void LLEnvironment::updatePreferences()
-{
-    /*NOOP for now.  TODO record prefs and store.*/
-}
-
 bool LLEnvironment::canEdit() const
 {
     return true;
@@ -1382,41 +1371,6 @@ void LLEnvironment::coroResetEnvironment(S32 parcel_id, S32 track_no, environmen
 
 
 //=========================================================================
-LLEnvironment::UserPrefs::UserPrefs() :
-    mUseRegionSettings(true),
-    mUseDayCycle(true),
-    mPersistEnvironment(false),
-    mWaterPresetName(),
-    mSkyPresetName(),
-    mDayCycleName()
-{}
-
-
-void LLEnvironment::UserPrefs::load()
-{
-    mPersistEnvironment = gSavedSettings.getBOOL("EnvironmentPersistAcrossLogin");
-
-    mWaterPresetName = gSavedSettings.getString("WaterPresetName");
-    mSkyPresetName = gSavedSettings.getString("SkyPresetName");
-    mDayCycleName = gSavedSettings.getString("DayCycleName");
-
-    mUseRegionSettings = mPersistEnvironment ? gSavedSettings.getBOOL("UseEnvironmentFromRegion") : true;
-    mUseDayCycle = mPersistEnvironment ? gSavedSettings.getBOOL("UseDayCycle") : true;
-}
-
-void LLEnvironment::UserPrefs::store()
-{
-    gSavedSettings.setBOOL("EnvironmentPersistAcrossLogin", mPersistEnvironment);
-    if (mPersistEnvironment)
-    {
-        gSavedSettings.setString("WaterPresetName", getWaterPresetName());
-        gSavedSettings.setString("SkyPresetName", getSkyPresetName());
-        gSavedSettings.setString("DayCycleName", getDayCycleName());
-
-        gSavedSettings.setBOOL("UseEnvironmentFromRegion", getUseRegionSettings());
-        gSavedSettings.setBOOL("UseDayCycle", getUseDayCycle());
-    }
-}
 
 LLEnvironment::EnvironmentInfo::EnvironmentInfo():
     mParcelId(INVALID_PARCEL_ID),