merge changes for maint-2936

indra/llui/CMakeLists.txt

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llnotifications.cpp

indra/llui/llnotifications.h

indra/llui/llnotificationslistener.cpp

indra/llui/llnotificationslistener.h

indra/llui/lltabcontainer.cpp

indra/llui/lluictrl.cpp

indra/llui/llview.cpp

indra/llui/llviewereventrecorder.cpp

indra/llui/llviewereventrecorder.h

indra/llwindow/llwindowmacosx.cpp

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llviewerkeyboard.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp