diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-09 21:56:33 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-09 21:56:33 +0300 |
| commit | a7603c84879e7a2d0f72d64e5988aae332d463c1 (patch) | |
| tree | 53618fa66969157487ea5511a112f0c482c4497a /indra/newview/llenvmanager.cpp | |
| parent | d6b0afb9148d8205ad10838513c247f947bcc7f8 (diff) | |
STORM-1279 WIP Renamed a method.
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 58d1349a63..03b37ecaed 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -596,27 +596,27 @@ std::string LLEnvPrefs::getDayCycleName() const return mDayCycleName; } -void LLEnvPrefs::setUseDefaults(bool val) +void LLEnvPrefs::setUseRegionSettings(bool val) { - mUseDefaults = val; + mUseRegionSettings = val; } void LLEnvPrefs::setUseWaterPreset(const std::string& name) { - setUseDefaults(false); + mUseRegionSettings = false; mWaterPresetName = name; } void LLEnvPrefs::setUseSkyPreset(const std::string& name) { - setUseDefaults(false); + mUseRegionSettings = false; mUseDayCycle = false; mSkyPresetName = name; } void LLEnvPrefs::setUseDayCycle(const std::string& name) { - setUseDefaults(false); + mUseRegionSettings = false; mUseDayCycle = true; mDayCycleName = name; } @@ -627,7 +627,7 @@ LLEnvManagerNew::LLEnvManagerNew() mInterpNextChangeMessage = true; // Set default environment settings. - mUserPrefs.mUseDefaults = true; + mUserPrefs.mUseRegionSettings = true; mUserPrefs.mUseDayCycle = true; mUserPrefs.mWaterPresetName = "Default"; mUserPrefs.mSkyPresetName = "Default"; @@ -636,7 +636,7 @@ LLEnvManagerNew::LLEnvManagerNew() bool LLEnvManagerNew::getUseRegionSettings() const { - return mUserPrefs.getUseDefaults(); + return mUserPrefs.getUseRegionSettings(); } bool LLEnvManagerNew::getUseDayCycle() const @@ -746,7 +746,7 @@ bool LLEnvManagerNew::useDayCycleParams(const LLSD& params, LLEnvKey::EScope sco void LLEnvManagerNew::setUseRegionSettings(bool val) { - mUserPrefs.setUseDefaults(val); + mUserPrefs.setUseRegionSettings(val); saveUserPrefs(); updateManagersFromPrefs(false); } @@ -799,8 +799,8 @@ void LLEnvManagerNew::loadUserPrefs() mUserPrefs.mSkyPresetName = gSavedSettings.getString("SkyPresetName"); mUserPrefs.mDayCycleName = gSavedSettings.getString("DayCycleName"); - mUserPrefs.mUseDefaults = gSavedSettings.getBOOL("UseEnvironmentFromRegion"); - mUserPrefs.mUseDayCycle = gSavedSettings.getBOOL("UseDayCycle"); + mUserPrefs.mUseRegionSettings = gSavedSettings.getBOOL("UseEnvironmentFromRegion"); + mUserPrefs.mUseDayCycle = gSavedSettings.getBOOL("UseDayCycle"); } void LLEnvManagerNew::saveUserPrefs() @@ -825,8 +825,8 @@ void LLEnvManagerNew::setUserPrefs( mUserPrefs.mSkyPresetName = sky_preset; mUserPrefs.mDayCycleName = day_cycle_preset; - mUserPrefs.mUseDefaults = use_region_settings; - mUserPrefs.mUseDayCycle = !use_fixed_sky; + mUserPrefs.mUseRegionSettings = use_region_settings; + mUserPrefs.mUseDayCycle = !use_fixed_sky; saveUserPrefs(); updateManagersFromPrefs(false); |