merge

indra/newview/CMakeLists.txt

indra/newview/llappviewer.cpp

indra/newview/llfloaterchatterbox.cpp

indra/newview/llfloaterinventory.cpp

indra/newview/llfloatervoicedevicesettings.cpp

indra/newview/llimfloater.cpp

indra/newview/llimpanel.cpp

indra/newview/llimpanel.h

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llnotificationtiphandler.cpp

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanelimcontrolpanel.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanellandmarks.h

indra/newview/llparticipantlist.cpp

indra/newview/llvoicechannel.cpp

indra/newview/llvoicechannel.h

indra/newview/llvoiceclient.cpp

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