diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
| commit | 73f474d886d2430db3d5c8f7729f769b389730a4 (patch) | |
| tree | 5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/win_crash_logger | |
| parent | 81ffd3fccac709a5903dd0d7572db50c50850347 (diff) | |
| parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) | |
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/win_crash_logger')
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/StdAfx.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/StdAfx.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/ll_icon.ico | bin | 2238 -> 2238 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/llcrashloggerwindows.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/llcrashloggerwindows.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/resource.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/win_crash_logger.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/win_crash_logger.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/win_crash_logger.ico | bin | 1078 -> 1078 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | indra/win_crash_logger/win_crash_logger.rc | 0 |
11 files changed, 1 insertions, 0 deletions
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt index aa35c3b05e..3c9a4b9756 100644..100755 --- a/indra/win_crash_logger/CMakeLists.txt +++ b/indra/win_crash_logger/CMakeLists.txt @@ -82,6 +82,7 @@ target_link_libraries(windows-crash-logger gdi32 ole32 oleaut32 + wininet Wldap32 ) diff --git a/indra/win_crash_logger/StdAfx.cpp b/indra/win_crash_logger/StdAfx.cpp index f56711af73..f56711af73 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 36d988ead7..36d988ead7 100644..100755 --- a/indra/win_crash_logger/llcrashloggerwindows.cpp +++ b/indra/win_crash_logger/llcrashloggerwindows.cpp diff --git a/indra/win_crash_logger/llcrashloggerwindows.h b/indra/win_crash_logger/llcrashloggerwindows.h index 5c45a998b3..5c45a998b3 100644..100755 --- a/indra/win_crash_logger/llcrashloggerwindows.h +++ b/indra/win_crash_logger/llcrashloggerwindows.h diff --git a/indra/win_crash_logger/resource.h b/indra/win_crash_logger/resource.h index 37a387275e..37a387275e 100644..100755 --- 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 8e916ae437..8e916ae437 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/indra/win_crash_logger/win_crash_logger.ico +++ b/indra/win_crash_logger/win_crash_logger.ico diff --git a/indra/win_crash_logger/win_crash_logger.rc b/indra/win_crash_logger/win_crash_logger.rc index 2819722f63..2819722f63 100644..100755 --- a/indra/win_crash_logger/win_crash_logger.rc +++ b/indra/win_crash_logger/win_crash_logger.rc |