Pulled merge from bento prime.

.hgtags

indra/llappearance/llavatarappearance.cpp

indra/llcharacter/lljoint.cpp

indra/llcharacter/lljoint.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llprimitive/lldaeloader.cpp

indra/llprimitive/llmodel.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_skeleton_tentacles.xml

indra/newview/llappviewer.cpp

indra/newview/llavatariconctrl.cpp

indra/newview/llchannelmanager.cpp

indra/newview/llchiclet.cpp

indra/newview/llchicletbar.cpp

indra/newview/lldrawpoolavatar.cpp

indra/newview/lldrawpoolavatar.h

indra/newview/llfloatermodelpreview.cpp