merge

indra/llui/llchatentry.cpp

indra/llui/llchatentry.h

indra/llui/llscrollbar.cpp

indra/llui/llscrollbar.h

indra/llui/llscrollcontainer.cpp

indra/llui/llscrollcontainer.h

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/lltoolbar.cpp

indra/newview/app_settings/settings_per_account.xml

indra/newview/llchiclet.cpp

indra/newview/llconversationview.cpp

indra/newview/lldonotdisturbnotificationstorage.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimcontainer.h

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimnearbychathandler.cpp