Upstream merge from lindenlab/viewer-neko

indra/llui/llnotifications.cpp

indra/llui/llnotifications.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llappearancemgr.cpp

indra/newview/llappviewer.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llimprocessing.cpp

indra/newview/llpanelnearbymedia.cpp

indra/newview/llpanelplaces.cpp

indra/newview/llpanelvolumepulldown.cpp

indra/newview/llstartup.cpp

indra/newview/lltoastalertpanel.cpp

indra/newview/lltoastnotifypanel.cpp

indra/newview/lltoastpanel.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermedia.h

indra/newview/llviewerparcelaskplay.cpp

indra/newview/llviewerparcelaskplay.h