merge changes for 3.7.12-release

indra/llui/llnotifications.h

indra/llui/llnotificationslistener.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llui/llxuiparser.cpp

indra/llvfs/llvfile.cpp

indra/llvfs/tests/lldiriterator_test.cpp

indra/llwindow/llwindow.cpp

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowsdl.cpp

indra/llxml/llxmlnode.h

indra/llxml/llxmlparser.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/keywords_lsl_default.xml

indra/newview/app_settings/llsd-lsl-syntax.rng

indra/newview/app_settings/settings.xml

indra/newview/installers/windows/installer_template.nsi