Merge

indra/llinventory/llsettingsbase.cpp

indra/llinventory/llsettingsdaycycle.cpp

indra/llinventory/llsettingssky.cpp

indra/llmessage/llassetstorage.cpp

indra/newview/lldaycyclemanager.cpp

indra/newview/lldaycyclemanager.h

indra/newview/llenvironment.cpp

indra/newview/llenvironment.h

indra/newview/llfloatereditextdaycycle.cpp

indra/newview/llfloaterfixedenvironment.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llpaneleditwater.cpp

indra/newview/llpanelenvironment.cpp

indra/newview/llsettingsvo.cpp

indra/newview/llstartup.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerparcelmgr.cpp

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