Merge

indra/llinventory/llsettingsdaycycle.cpp

indra/llinventory/llsettingssky.cpp

indra/llinventory/llsettingswater.cpp

indra/newview/llenvironment.cpp

indra/newview/llenvironment.h

indra/newview/llfloatereditextdaycycle.cpp

indra/newview/llfloaterfixedenvironment.cpp

indra/newview/lllegacyatmospherics.cpp

indra/newview/llsettingsvo.cpp

indra/newview/skins/default/xui/de/floater_about_land.xml

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

...newview/skins/default/xui/de/floater_fixedenvironment.xml

...ew/skins/default/xui/de/floater_inventory_view_finder.xml

.../newview/skins/default/xui/de/floater_my_environments.xml

.../newview/skins/default/xui/de/floater_settings_picker.xml

indra/newview/skins/default/xui/de/menu_inventory.xml

indra/newview/skins/default/xui/de/menu_inventory_add.xml

indra/newview/skins/default/xui/de/menu_save_settings.xml

indra/newview/skins/default/xui/de/menu_settings_add.xml

indra/newview/skins/default/xui/de/menu_settings_gear.xml