Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public

indra/newview/llagentcamera.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llpaneleditwearable.cpp

indra/newview/llpaneleditwearable.h

indra/newview/llsidepanelappearance.cpp

indra/newview/llsidepanelappearance.h

indra/newview/llviewerinventory.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

indra/newview/llvoavatarself.h

indra/newview/llwearable.cpp

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