Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into cronchy

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_mac.txt

indra/newview/llcontrolavatar.cpp

indra/newview/lldrawable.cpp

indra/newview/llface.cpp

indra/newview/llflexibleobject.cpp

indra/newview/llmanip.cpp

indra/newview/llsculptidsize.cpp

indra/newview/llsky.cpp

indra/newview/llspatialpartition.cpp

indra/newview/llviewercontrol.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h

indra/newview/llviewerobjectlist.cpp

indra/newview/llviewerpartsim.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatarself.cpp

indra/newview/llvograss.cpp