Merge from default branch

indra/llcharacter/llcharacter.cpp

indra/llcharacter/lleditingmotion.cpp

indra/llmath/llvolume.cpp

indra/llplugin/llpluginmessagepipe.cpp

indra/llplugin/llpluginprocesschild.cpp

indra/llui/llconsole.cpp

indra/llui/llconsole.h

indra/llui/lltabcontainer.cpp

indra/llwindow/lldragdropwin32.cpp

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llappviewer.cpp

indra/newview/lldrawable.cpp

indra/newview/lldrawpoolalpha.cpp

indra/newview/lldriverparam.cpp

indra/newview/llface.cpp

indra/newview/llface.h

indra/newview/llfloatermediasettings.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h