Merge

indra/llinventory/llsettingsbase.cpp

indra/llinventory/llsettingsbase.h

indra/llinventory/llsettingsdaycycle.cpp

indra/llinventory/llsettingsdaycycle.h

indra/newview/llenvironment.cpp

indra/newview/llenvironment.h

indra/newview/llfloatereditextdaycycle.cpp

indra/newview/llfloatereditextdaycycle.h

indra/newview/llpaneleditsky.cpp

indra/newview/llpaneleditwater.cpp

...wview/skins/default/xui/en/floater_edit_ext_day_cycle.xml

...newview/skins/default/xui/en/panel_settings_sky_atmos.xml

...ewview/skins/default/xui/en/panel_settings_sky_clouds.xml

...wview/skins/default/xui/en/panel_settings_sky_sunmoon.xml

indra/newview/skins/default/xui/en/panel_settings_water.xml