Automated merge with ssh://hg.lindenlab.com/q/viewer-release

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventoryfunctions.h

indra/newview/llpanelobjectinventory.cpp

indra/newview/llselectmgr.h

indra/newview/llsidepaneltaskinfo.cpp

indra/newview/llsidepaneltaskinfo.h

indra/newview/llviewermenu.cpp

indra/newview/llvoavatar.cpp

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

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