merge callums latest changes

.hgtags

autobuild.xml

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/media_plugins/cef/media_plugin_cef.cpp

indra/media_plugins/libvlc/media_plugin_libvlc.cpp

indra/media_plugins/quicktime/media_plugin_quicktime.cpp

indra/newview/VIEWER_VERSION.txt

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

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

...view/app_settings/shaders/class1/objects/fullbrightV.glsl

.../newview/app_settings/shaders/class1/objects/simpleV.glsl

indra/newview/lldrawpool.cpp

indra/newview/llfloaterwebcontent.cpp

indra/newview/llfloaterwebcontent.h

indra/newview/llinventorymodel.cpp