merge release@82383 viewer-cleanup2-7-merge@82828

indra/llcommon/indra_constants.h

indra/llcommon/llevent.h

indra/llcommon/llfile.cpp

indra/llui/llbutton.cpp

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/llui.cpp

indra/llui/llview.cpp

indra/llui/llview.h

indra/llvfs/llvfile.cpp

indra/llvfs/llvfile.h

indra/llxml/llcontrol.cpp

indra/llxml/llcontrol.h

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_crash_behavior.xml

indra/newview/app_settings/settings_files.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/installers/windows/installer_template.nsi

indra/newview/llagent.cpp