merge changes for 3.6.0-materials-beta1

.hgtags

indra/llaudio/llaudioengine_fmodex.cpp

indra/llcommon/llapp.cpp

indra/llcommon/llerrorthread.cpp

indra/llcommon/llsys.cpp

indra/llmessage/llares.cpp

indra/llmessage/llareslistener.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/llvfs/lldir_win32.cpp

indra/newview/app_settings/settings.xml

...iew/app_settings/shaders/class1/deferred/fullbrightF.glsl

...pp_settings/shaders/class1/deferred/fullbrightShinyF.glsl

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

...wview/app_settings/shaders/class1/deferred/materialF.glsl

indra/newview/app_settings/shaders/class1/deferred/skyF.glsl

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

...app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl

...gs/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl

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