Merge from default branch

indra/llcommon/llassettype.cpp

indra/llimage/llimage.cpp

indra/llinventory/llinventorytype.cpp

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginmessagepipe.cpp

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocesschild.h

indra/llplugin/llpluginprocessparent.cpp

indra/llplugin/llpluginprocessparent.h

indra/llui/llspinctrl.cpp

indra/llui/llspinctrl.h

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llselectmgr.cpp

indra/newview/lltexturefetch.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermessage.cpp

indra/newview/skins/default/xui/en/menu_inventory.xml