Merge with tip

indra/newview/llinventorymodel.cpp

indra/newview/llinventorypanel.cpp

indra/newview/lltexlayerparams.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatarself.cpp

indra/newview/llvovolume.cpp

indra/newview/llwearable.cpp

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

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

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