Merged with viewer-dev-materials

.hgtags

doc/contributions.txt

indra/llcommon/tests/llprocess_test.cpp

indra/llcorehttp/tests/test_httpstatus.hpp

indra/llmessage/llavatarnamecache.cpp

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/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

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

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