diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-10 11:50:41 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-10 11:50:41 +0300 |
| commit | 172dc08a0fa961c4fb0fc88d31d067c1dd716fcf (patch) | |
| tree | dd0a75db62b45ad1dd85c83fa87f2e4f4ceceb4e /indra/newview/llenvmanager.cpp | |
| parent | 1b64453199cb8c31886b1debe6b5268d731f2298 (diff) | |
MAINT-2477 FIXED Environment settings won't persist across logins by default, but it may be changed by using EnvironmentPersistAcrossLogin setting
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rwxr-xr-x | indra/newview/llenvmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 41d378fea1..a626ad1bff 100755 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -303,7 +303,8 @@ void LLEnvManagerNew::loadUserPrefs() mUserPrefs.mSkyPresetName = gSavedSettings.getString("SkyPresetName"); mUserPrefs.mDayCycleName = gSavedSettings.getString("DayCycleName"); - mUserPrefs.mUseRegionSettings = gSavedSettings.getBOOL("UseEnvironmentFromRegion"); + bool use_region_settings = gSavedSettings.getBOOL("EnvironmentPersistAcrossLogin") ? gSavedSettings.getBOOL("UseEnvironmentFromRegion") : true; + mUserPrefs.mUseRegionSettings = use_region_settings; mUserPrefs.mUseDayCycle = gSavedSettings.getBOOL("UseDayCycle"); if (mUserPrefs.mUseRegionSettings) |