From 172dc08a0fa961c4fb0fc88d31d067c1dd716fcf Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 10 Oct 2014 11:50:41 +0300
Subject: MAINT-2477 FIXED Environment settings won't persist across logins by
 default, but it may be changed by using EnvironmentPersistAcrossLogin setting

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llenvmanager.cpp          |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6ac9c161d1..d9161b0a10 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13180,6 +13180,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EnvironmentPersistAcrossLogin</key>
+    <map>
+      <key>Comment</key>
+      <string>Keep Environment settings consistent across sessions</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>UseDayCycle</key>
     <map>
       <key>Comment</key>
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)
-- 
cgit v1.2.3