Merge branch 'master' into DRTVWR-539

indra/cmake/Copy3rdPartyLibs.cmake

indra/lib/python/indra/util/llmanifest.py

indra/llmath/lloctree.h

indra/llmath/llvolume.cpp

indra/newview/VIEWER_VERSION.txt

...pp_settings/shaders/class1/deferred/fullbrightShinyV.glsl

...gs/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl

...app_settings/shaders/class1/objects/fullbrightShinyV.glsl

...a/newview/app_settings/shaders/class1/objects/shinyV.glsl

indra/newview/lldrawpoolbump.cpp

indra/newview/llface.cpp

indra/newview/llpanelgroupcreate.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llspatialpartition.h

indra/newview/llstartup.cpp

indra/newview/llvieweroctree.cpp

indra/newview/llvoavatar.cpp

indra/newview/pipeline.cpp

indra/newview/skins/default/xui/de/strings.xml

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