From cccca566bd2365c88cca819729c5432af9dfa52f Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 16 May 2011 17:17:01 +0300
Subject: STORM-1245 WIP Reimplementing management of local presets according
 to the new spec.

User environment preferences are now persistent.

TODO: Implement applying region env. settings.
---
 indra/newview/llfloaterwindlight.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterwindlight.cpp')

diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp
index 34629ec5c4..b90f576555 100644
--- a/indra/newview/llfloaterwindlight.cpp
+++ b/indra/newview/llfloaterwindlight.cpp
@@ -89,7 +89,8 @@ BOOL LLFloaterWindLight::postBuild()
 		comboBox->add(LLStringUtil::null);
 
 		// set defaults on combo boxes
-		comboBox->selectByValue(LLSD("Default"));
+		LLEnvManagerNew& env_mgr = LLEnvManagerNew::instance();
+		comboBox->selectByValue(env_mgr.getUseFixedSky() ? env_mgr.getSkyPresetName() : LLStringUtil::null);
 	}
 
 	// add the list of presets
@@ -920,7 +921,11 @@ void LLFloaterWindLight::onChangePresetName(LLUICtrl* ctrl)
 		return;
 	}
 	
+#if 0
 	LLWLParamManager::getInstance()->loadPreset(LLWLParamKey(combo_box->getSelectedValue()));
+#else
+	LLEnvManagerNew::instance().setUseSkyPreset(LLWLParamKey(combo_box->getSelectedValue()).name);
+#endif
 	sWindLight->syncMenu();
 }
 
-- 
cgit v1.2.3