From 3a8521c38b17adb9d3006be0d7a23f94da7bcaea Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Mon, 30 May 2011 22:44:30 +0300 Subject: STORM-1244 WIP Minor bug fix in the Environment Settings floater. Populate combo boxes *before* accessing them. --- indra/newview/llfloaterenvironmentsettings.cpp | 8 ++++---- 1 file 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(); -- cgit v1.2.3