merge...

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/llnotifications.cpp

indra/llui/llnotifications.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llavataractions.cpp

indra/newview/llavatariconctrl.cpp

indra/newview/llavatariconctrl.h

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchannelmanager.cpp

indra/newview/llchannelmanager.h

indra/newview/llchatitemscontainerctrl.cpp