Merge

indra/llinventory/llsettingsdaycycle.cpp

indra/llinventory/llsettingsdaycycle.h

indra/llinventory/llsettingssky.cpp

indra/llinventory/llsettingssky.h

indra/llinventory/llsettingswater.cpp

indra/llinventory/llsettingswater.h

indra/newview/llenvironment.cpp

indra/newview/llenvironment.h

indra/newview/llfloatereditextdaycycle.cpp

indra/newview/llfloaterenvironmentsettings.cpp

indra/newview/llfloaterfixedenvironment.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llsettingsvo.cpp

indra/newview/llsettingsvo.h

indra/newview/llviewermenu.cpp

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

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

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