Merge

indra/llinventory/llsettingsbase.cpp

indra/llinventory/llsettingssky.cpp

.../newview/app_settings/shaders/class1/deferred/alphaF.glsl

...wview/app_settings/shaders/class1/deferred/materialF.glsl

...view/app_settings/shaders/class1/deferred/shadowUtil.glsl

...ew/app_settings/shaders/class1/deferred/softenLightF.glsl

.../newview/app_settings/shaders/class1/deferred/waterF.glsl

..._settings/shaders/class1/windlight/atmosphericsFuncs.glsl

...ew/app_settings/shaders/class2/deferred/softenLightF.glsl

.../app_settings/shaders/class2/windlight/atmosphericsV.glsl

...iew/app_settings/shaders/class2/windlight/transportF.glsl

.../newview/app_settings/shaders/class3/lighting/lightV.glsl

.../app_settings/shaders/class3/windlight/atmosphericsF.glsl

...iew/app_settings/shaders/class3/windlight/transportF.glsl

indra/newview/llfloaterfixedenvironment.cpp

indra/newview/llfloaterfixedenvironment.h

indra/newview/llsettingsvo.cpp

indra/newview/lltexturectrl.cpp

indra/newview/llvosky.cpp

indra/newview/pipeline.cpp