Merge branch 'master' into DRTVWR-518-ui

indra/llappearance/llavatarappearancedefines.cpp

indra/llappearance/llavatarappearancedefines.h

indra/newview/VIEWER_VERSION.txt

indra/newview/llcontrolavatar.cpp

indra/newview/llcontrolavatar.h

indra/newview/lldrawable.cpp

indra/newview/lldrawpoolavatar.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerpartsource.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

indra/newview/llvoavatarself.h

indra/newview/pipeline.cpp

scripts/content_tools/arche_tool.py