Automated merge up from viewer-development into mesh-development

.hgtags

BuildParams

build.sh

doc/contributions.txt

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llcommon/llmemtype.cpp

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/llappviewer.cpp

indra/newview/llcapabilityprovider.h

indra/newview/lldynamictexture.cpp

indra/newview/llface.cpp

indra/newview/llfloatermap.cpp