Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

indra/llappearance/llavatarappearance.cpp

indra/llappearance/llavatarjointmesh.cpp

indra/llappearance/lldriverparam.h

indra/llappearance/llpolymesh.cpp

indra/llappearance/llpolymesh.h

indra/llappearance/llpolyskeletaldistortion.cpp

indra/llappearance/llpolyskeletaldistortion.h

indra/llappearance/lltexlayer.cpp

indra/llappearance/llwearable.h

indra/llaudio/llaudiodecodemgr.cpp

indra/llaudio/llaudiodecodemgr.h

indra/llaudio/llaudioengine.cpp

indra/llaudio/llaudioengine.h

indra/llaudio/llstreamingaudio_fmodex.h

indra/llcharacter/llanimationstates.h

indra/llcharacter/llcharacter.h

indra/llcharacter/llgesture.cpp

indra/llcharacter/llgesture.h

indra/llcharacter/lljoint.cpp

indra/llcharacter/lljoint.h