Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

indra/newview/CMakeLists.txt

indra/newview/llavataractions.cpp

indra/newview/llimview.cpp

indra/newview/llnotificationhandler.h

indra/newview/llnotificationmanager.cpp

indra/newview/llnotificationofferhandler.cpp

indra/newview/llnotificationscripthandler.cpp

indra/newview/llscreenchannel.h

indra/newview/llsyswellwindow.cpp

indra/newview/skins/default/xui/en/notifications.xml