Automated merge with http://hg.secondlife.com/viewer-development

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llprimitive/lltextureentry.cpp

indra/llrender/llimagegl.cpp

indra/llvfs/lldir.cpp

indra/newview/app_settings/settings.xml

indra/newview/llcapabilityprovider.h

indra/newview/lldynamictexture.cpp

indra/newview/llface.cpp

indra/newview/llpreviewtexture.cpp

indra/newview/lltexturecache.cpp

indra/newview/lltexturefetch.cpp

indra/newview/lltexturefetch.h

indra/newview/lltextureview.cpp

indra/newview/llviewerobjectlist.cpp

indra/newview/llviewerobjectlist.h

indra/newview/llviewerregion.cpp

indra/newview/llviewerregion.h