merge changes for storm-1564

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llplugininstance.h

indra/llplugin/llpluginmessagepipe.h

indra/llplugin/llpluginprocessparent.h

indra/llrender/llgl.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrender.cpp

indra/llrender/llshadermgr.cpp

indra/llwindow/llwindowwin32.cpp

...p_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl

...ngs/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl

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

...pp_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl

...pp_settings/shaders/class1/deferred/shadowAlphaMaskV.glsl

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

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

...ewview/app_settings/shaders/class1/objects/impostorF.glsl

...ewview/app_settings/shaders/class1/objects/impostorV.glsl

...app_settings/shaders/class2/lighting/lightAlphaMaskF.glsl