merge release@82858 maint-render-2-merge@83010 -> release

indra/llcommon/llfile.cpp

indra/llcommon/llfile.h

indra/llimagej2coj/llimagej2coj.cpp

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llrender/llrendertarget.cpp

indra/llrender/llrendertarget.h

indra/llwindow/llwindow.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowheadless.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/llwindow/llwindowmesaheadless.h

indra/llwindow/llwindowsdl.cpp

indra/llwindow/llwindowsdl.h

indra/llwindow/llwindowwin32.cpp

indra/llwindow/llwindowwin32.h

indra/newview/app_settings/settings.xml

...ewview/app_settings/shaders/class1/deferred/diffuseF.glsl

...ewview/app_settings/shaders/class1/deferred/diffuseV.glsl