merge

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llfloatertools.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatarself.cpp

indra/newview/llvovolume.cpp

indra/newview/llvovolume.h

indra/newview/llwearable.cpp

indra/newview/llwearable.h

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

...a/newview/skins/default/xui/en/panel_im_control_panel.xml

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