Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials

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

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

indra/newview/llspatialpartition.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewershadermgr.cpp

indra/newview/llvotree.cpp

indra/newview/llvotree.h

indra/newview/pipeline.cpp

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