Automated merge up from viewer-development into mesh-development

doc/contributions.txt

indra/llcharacter/llanimationstates.cpp

indra/llcommon/llavatarconstants.h

indra/llcommon/lllslconstants.h

indra/llcommon/llmetricperformancetester.h

indra/llmath/llcamera.cpp

indra/llmath/llcamera.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llplugininstance.cpp

indra/llplugin/llplugininstance.h

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocesschild.h

indra/llplugin/llpluginprocessparent.cpp

indra/llplugin/llpluginprocessparent.h

indra/newview/llchathistory.cpp

indra/newview/llcolorswatch.cpp

indra/newview/llimview.cpp

indra/newview/lltoastnotifypanel.cpp

indra/newview/llviewermedia.cpp