merging

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/newview/llavataractions.cpp

indra/newview/llfloaterconversationpreview.cpp

indra/newview/llfloaterconversationpreview.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimcontainer.h

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimnearbychat.h

indra/newview/lllogchat.cpp

indra/newview/lllogchat.h

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpeoplemenus.cpp

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