merge

indra/newview/llfloatersnapshot.cpp

indra/newview/llnotificationtiphandler.cpp

indra/newview/llpaneleditwearable.cpp

indra/newview/llpaneleditwearable.h

indra/newview/llpaneloutfitedit.cpp

indra/newview/llscreenchannel.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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