Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/newview/llappviewer.cpp

indra/newview/lldynamictexture.cpp

indra/newview/lldynamictexture.h

indra/newview/llfloateranimpreview.cpp

indra/newview/llfloateranimpreview.h

indra/newview/llfloaterimagepreview.cpp

indra/newview/llfloaterimagepreview.h

indra/newview/lltexlayer.cpp

indra/newview/lltexlayer.h

indra/newview/lltoolmorph.cpp

indra/newview/lltoolmorph.h

indra/newview/pipeline.cpp

indra/newview/pipeline.h