merge

.hgtags

autobuild.xml

indra/llappearance/llavatarappearance.cpp

indra/llappearance/llwearabletype.cpp

indra/llaudio/llaudiodecodemgr.cpp

indra/llcharacter/llkeyframemotion.cpp

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/llerror.cpp

indra/llcommon/llerror.h

indra/llcommon/llprocessor.cpp

indra/llcommon/llthread.cpp

indra/llcommon/tests/llerror_test.cpp

indra/llcorehttp/httpstats.cpp

indra/llcorehttp/tests/test_refcounted.hpp

indra/llimage/llimage.cpp

indra/llimage/llimagebmp.cpp

indra/llimage/llimagedxt.cpp

indra/llimage/llimagejpeg.cpp

indra/llimage/llimagepng.cpp