STORM-1244 WIP Minor bug fix in the Environment Settings floater.

Populate combo boxes *before* accessing them.

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llfloaterenvironmentsettings.cpp b/indra/newview/llfloaterenvironmentsettings.cpp
index 9fb44521a2..49f0161bdd 100644
--- a/indra/newview/llfloaterenvironmentsettings.cpp
+++ b/indra/newview/llfloaterenvironmentsettings.cpp
@@ -91,15 +91,15 @@ void LLFloaterEnvironmentSettings::onOpen(const LLSD& key)
 	mRegionSettingsRadioGroup->setSelectedIndex(mUseRegionSettings ? 0 : 1);
 	mDayCycleSettingsRadioGroup->setSelectedIndex(mUseFixedSky ? 0 : 1);
 
-	// Update other controls state based on the selected radio buttons.
-	onSwitchRegionSettings();
-	onSwitchDayCycle();
-
 	// Populate the combo boxes with appropriate lists of available presets.
 	populateWaterPresetsList();
 	populateSkyPresetsList();
 	populateDayCyclePresetsList();
 
+	// Update other controls state based on the selected radio buttons.
+	onSwitchRegionSettings();
+	onSwitchDayCycle();
+
 	// Save water, sky and day cycle presets to restore them
 	// in case of "Cancel" button has been pressed.
 	mWaterPreset = env_mgr->getWaterPresetName();