merge

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/llfloaterreg.h

indra/newview/app_settings/settings.xml

indra/newview/llchiclet.cpp

indra/newview/llchiclet.h

indra/newview/llfloateravatarpicker.cpp

indra/newview/llfloateravatarpicker.h

indra/newview/llimfloater.cpp

indra/newview/llnearbychatbar.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llsyswellwindow.cpp

indra/newview/lltoast.cpp

indra/newview/lltoast.h

indra/newview/llviewermessage.cpp

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

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

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