Pull merge from lindenlab/viewer-release

11 files changed, 5 insertions, 0 deletions

diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 5329c89554..3c9a4b9756 100644..100755
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -21,6 +21,10 @@ include_directories(
     ${LLXML_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
     )
+include_directories(SYSTEM
+    ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
+    ${LLXML_SYSTEM_INCLUDE_DIRS}
+    )
 
 set(win_crash_logger_SOURCE_FILES
     win_crash_logger.cpp
@@ -78,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
index 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
index 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