merge

indra/llui/llfloater.cpp

indra/newview/app_settings/settings.xml

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llchiclet.cpp

indra/newview/llimfloater.cpp

indra/newview/llimpanel.cpp

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llmutelist.cpp

indra/newview/llpanelface.cpp

indra/newview/llpanelgroup.cpp

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanellandaudio.cpp

indra/newview/llpanellandaudio.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanellandmarks.h

indra/newview/llpanelplaces.cpp

indra/newview/llpanelteleporthistory.cpp