Merge with viewer-materials tip

.hgtags

BuildParams

indra/cmake/LLAddBuildTest.cmake

indra/llcorehttp/_httpinternal.h

indra/llcorehttp/examples/http_texture_load.cpp

indra/llprimitive/llmaterialid.cpp

indra/llprimitive/llmaterialid.h

indra/llrender/llrendertarget.cpp

indra/llrender/llrendertarget.h

indra/llwindow/llwindowsdl.cpp

indra/newview/app_settings/settings.xml

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

indra/newview/gpu_table.txt

indra/newview/llfeaturemanager.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llgroupmgr.cpp

indra/newview/llgroupmgr.h

indra/newview/llpanelgroupgeneral.cpp

indra/newview/llpanelgroupgeneral.h

indra/newview/llpanelgrouproles.cpp