diff options
Diffstat (limited to 'indra/win_crash_logger')
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/CMakeLists.txt | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/StdAfx.cpp | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/StdAfx.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/ll_icon.ico | bin | 2238 -> 2238 bytes | |||
-rw-r--r-- | indra/win_crash_logger/llcrashloggerwindows.cpp | 16 | ||||
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/resource.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/win_crash_logger.cpp | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/win_crash_logger.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | indra/win_crash_logger/win_crash_logger.ico | bin | 1078 -> 1078 bytes |
9 files changed, 6 insertions, 16 deletions
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt index c6070020db..144d037a31 100755..100644 --- a/indra/win_crash_logger/CMakeLists.txt +++ b/indra/win_crash_logger/CMakeLists.txt @@ -4,6 +4,7 @@ project(win_crash_logger) include(00-Common) include(LLCommon) +include(LLCoreHttp) include(LLCrashLogger) include(LLMath) include(LLMessage) @@ -13,8 +14,10 @@ include(LLXML) include(Linking) include(LLSharedLibs) include(GoogleBreakpad) +include(Boost) include_directories( + ${LLCOREHTTP_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${LLCRASHLOGGER_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} @@ -77,7 +80,10 @@ target_link_libraries(windows-crash-logger ${LLXML_LIBRARIES} ${LLMESSAGE_LIBRARIES} ${LLMATH_LIBRARIES} + ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} + ${BOOST_CONTEXT_LIBRARY} + ${BOOST_COROUTINE_LIBRARY} ${WINDOWS_LIBRARIES} ${DXGUID_LIBRARY} ${GOOGLE_PERFTOOLS_LIBRARIES} diff --git a/indra/win_crash_logger/StdAfx.cpp b/indra/win_crash_logger/StdAfx.cpp index f56711af73..f56711af73 100755..100644 --- a/indra/win_crash_logger/StdAfx.cpp +++ b/indra/win_crash_logger/StdAfx.cpp diff --git a/indra/win_crash_logger/StdAfx.h b/indra/win_crash_logger/StdAfx.h index 35976658ac..35976658ac 100755..100644 --- a/indra/win_crash_logger/StdAfx.h +++ b/indra/win_crash_logger/StdAfx.h diff --git a/indra/win_crash_logger/ll_icon.ico b/indra/win_crash_logger/ll_icon.ico Binary files differindex 566346dfe3..566346dfe3 100755..100644 --- a/indra/win_crash_logger/ll_icon.ico +++ b/indra/win_crash_logger/ll_icon.ico diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp index 51e70f95b6..23c29e6b18 100644 --- a/indra/win_crash_logger/llcrashloggerwindows.cpp +++ b/indra/win_crash_logger/llcrashloggerwindows.cpp @@ -171,22 +171,6 @@ bool handle_button_click(WORD button_id) return false; } - // See if "do this next time" is checked and save state - S32 crash_behavior = CRASH_BEHAVIOR_ASK; - LRESULT result = SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_GETCHECK, 0, 0); - if (result == BST_CHECKED) - { - if (button_id == IDOK) - { - crash_behavior = CRASH_BEHAVIOR_ALWAYS_SEND; - } - else if (button_id == IDCANCEL) - { - crash_behavior = CRASH_BEHAVIOR_NEVER_SEND; - } - ((LLCrashLoggerWindows*)LLCrashLogger::instance())->saveCrashBehaviorSetting(crash_behavior); - } - // We're done with this dialog. gFirstDialog = FALSE; diff --git a/indra/win_crash_logger/resource.h b/indra/win_crash_logger/resource.h index 37a387275e..37a387275e 100755..100644 --- a/indra/win_crash_logger/resource.h +++ b/indra/win_crash_logger/resource.h diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp index 366edd894b..366edd894b 100755..100644 --- a/indra/win_crash_logger/win_crash_logger.cpp +++ b/indra/win_crash_logger/win_crash_logger.cpp diff --git a/indra/win_crash_logger/win_crash_logger.h b/indra/win_crash_logger/win_crash_logger.h index 2cc2cf3dcf..2cc2cf3dcf 100755..100644 --- a/indra/win_crash_logger/win_crash_logger.h +++ b/indra/win_crash_logger/win_crash_logger.h diff --git a/indra/win_crash_logger/win_crash_logger.ico b/indra/win_crash_logger/win_crash_logger.ico Binary files differindex 386883523b..386883523b 100755..100644 --- a/indra/win_crash_logger/win_crash_logger.ico +++ b/indra/win_crash_logger/win_crash_logger.ico |