merge

.hgtags

doc/contributions.txt

indra/llcommon/llassettype.h

indra/llcommon/llerror.cpp

indra/llmessage/llassetstorage.cpp

indra/llmessage/llassetstorage.h

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llmeshrepository.cpp

indra/newview/llmeshrepository.h

indra/newview/lltexturefetch.cpp

indra/newview/lltexturefetch.h

indra/newview/llviewerassetstats.cpp

indra/newview/llviewerassetstats.h

indra/newview/llviewerassetstorage.cpp

indra/newview/llviewerassetstorage.h

indra/newview/llviewerdisplay.cpp

indra/newview/llviewerregion.cpp

indra/newview/llviewerregion.h