Automated merge with ssh://bitbucket.org/lindenlab/viewer-vs2017

.hgtags

doc/contributions.txt

indra/CMakeLists.txt

indra/cmake/00-Common.cmake

indra/llappearance/llavatarappearance.cpp

indra/llappearance/llavatarappearancedefines.cpp

indra/llappearance/llavatarappearancedefines.h

indra/llappearance/lltexlayer.cpp

indra/llappearance/llwearabletype.cpp

indra/llappearance/llwearabletype.h

indra/llaudio/llvorbisencode.h

indra/llcommon/indra_constants.cpp

indra/llcommon/indra_constants.h

indra/llcommon/llstring.h

indra/llcommon/lluri.cpp

indra/llcommon/lluri.h

indra/llcommon/tests/lluri_test.cpp

indra/llcorehttp/_httplibcurl.cpp

indra/llimage/llimagebmp.cpp

indra/llinventory/llinventorytype.h