merge

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/newview/app_settings/settings.xml

indra/newview/llchiclet.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llimfloatercontainer.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/lllocationinputctrl.cpp

indra/newview/lllocationinputctrl.h

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanellandmarks.h

indra/newview/llpanelplaces.cpp

indra/newview/llparticipantlist.cpp

indra/newview/llspeakers.cpp