Merging in main repository.

indra/llcommon/tests/llprocess_test.cpp

indra/llcorehttp/tests/test_httpstatus.hpp

indra/llprimitive/llmaterial.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/llprimitive/llprimtexturelist.cpp

indra/llprimitive/llprimtexturelist.h

indra/llprimitive/lltextureentry.cpp

indra/llprimitive/lltextureentry.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

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

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

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

indra/newview/lldrawable.cpp

indra/newview/lldrawable.h

indra/newview/lldrawpoolbump.cpp

indra/newview/llface.cpp

indra/newview/llface.h

indra/newview/llselectmgr.cpp