Merge with upstream at https://bitbucket.org/rider_linden/viewer-eep

indra/llinventory/llsettingssky.cpp

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

...a/newview/app_settings/shaders/class1/deferred/moonF.glsl

...app_settings/shaders/class1/deferred/multiSpotLightF.glsl

...iew/app_settings/shaders/class1/deferred/pointLightF.glsl

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

.../newview/app_settings/shaders/class1/windlight/moonF.glsl

...app_settings/shaders/class2/deferred/multiSpotLightF.glsl

...view/app_settings/shaders/class2/deferred/spotLightF.glsl

...app_settings/shaders/class3/deferred/multiSpotLightF.glsl

...view/app_settings/shaders/class3/deferred/spotLightF.glsl

indra/newview/llpanelenvironment.cpp

indra/newview/llvovolume.cpp

indra/newview/pipeline.cpp

...newview/skins/default/xui/en/panel_region_environment.xml

indra/newview/skins/default/xui/en/widgets/line_editor.xml