Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer

indra/llinventory/llsettingsbase.cpp

indra/llinventory/llsettingsbase.h

indra/llinventory/llsettingsdaycycle.cpp

indra/llinventory/llsettingsdaycycle.h

indra/llmath/v4color.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/newview/llappviewer.cpp

indra/newview/llenvironment.cpp

indra/newview/llenvironment.h

indra/newview/llfloatereditextdaycycle.cpp

indra/newview/llfloaterfixedenvironment.cpp

indra/newview/llpanelvolume.cpp

indra/newview/llsettingsvo.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llvovolume.cpp

indra/newview/llvovolume.h

indra/newview/pipeline.cpp