merge changes for storm-1482

indra/linux_crash_logger/linux_crash_logger.cpp

indra/linux_crash_logger/llcrashloggerlinux.cpp

indra/llcommon/indra_constants.h

indra/llcrashlogger/llcrashlogger.cpp

indra/llcrashlogger/llcrashlogger.h

indra/mac_crash_logger/CrashReporter.nib/objects.xib

indra/mac_crash_logger/llcrashloggermac.cpp

indra/mac_crash_logger/mac_crash_logger.cpp

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings_files.xml

indra/newview/llappviewer.cpp

indra/newview/llappviewerlinux.cpp

indra/newview/llappviewerwin32.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llviewercontrol.cpp

.../newview/skins/default/xui/en/panel_preferences_setup.xml

indra/win_crash_logger/llcrashloggerwindows.cpp

indra/win_crash_logger/llcrashloggerwindows.h

indra/win_crash_logger/win_crash_logger.cpp