merge

indra/llui/llfloater.cpp

indra/llui/llmultifloater.cpp

indra/llui/llmultifloater.h

indra/newview/llagent.cpp

indra/newview/lltoolmorph.cpp

indra/newview/llvoavatarself.cpp

indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png

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

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

.../newview/skins/default/xui/en/panel_outfits_inventory.xml