automated merge from viewer-2-0

indra/llaudio/llaudioengine.cpp

indra/llaudio/llaudioengine.h

indra/llui/lldockablefloater.cpp

indra/llui/lldockcontrol.cpp

indra/llui/lldockcontrol.h

indra/llui/llscrolllistctrl.cpp

indra/llui/lltooltip.cpp

indra/llui/lltooltip.h

indra/llui/llui.cpp

indra/llui/llui.h

indra/llui/lluiimage.h

indra/llui/llurlentry.cpp

indra/llxuixml/llinitparam.cpp

indra/llxuixml/llinitparam.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llavatarlistitem.cpp

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchathistory.cpp