diff --git a/autobuild.xml b/autobuild.xml
index e0dc2eef3b2ec662bd58e9a536b7f732d0735293..3c167ac7bfdae1bca7f4b89783597e6a9275fa7d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1962,11 +1962,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>56cd32dc7e782b2ff6749b4eadb9b3118765f289c4d6c0555e546e499ab0ebcfa7dd8ee93146d06ff45d65c543640f1f821813a5833d2b2d130eedeb7481b2bd</string>
+ <string>0e707dca68b941a02f5b78f982cc7b6bc7c4dc5c5cdb2deedcb0554a20119ce2c765642c5a2c12177e4b483bee15eb1c4990db3da415608cf1770fa4406f982c</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/7.31.3-0.5.2.1835/sentry-7.31.3-0.5.2-darwin64-1835.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/7.31.3-0.6.0.1898/sentry-7.31.3-0.6.0-darwin64-1898.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -1976,11 +1976,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>9020ca48029a91ac7f0b8eb2e8503a340771c8851e1ddd0a76250d8a2cebb22e72f9e205e5d9053c5d409880c4891a00cda0e85004e13908c08956f37f9d8fcd</string>
+ <string>8de51c691858e9b4aee51c278f731aa17aa8a0c5630e2245a587d98f2d91301c0fb949fa6e22c9ca9d97aea356a2c9c5840227855dc6047b3b4c42ef92343aa4</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/7.31.3-0.5.2.1835/sentry-7.31.3-0.5.2-linux64-1835.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/7.31.3-0.6.0.1898/sentry-7.31.3-0.6.0-linux64-1898.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -1990,18 +1990,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>56bc0520511d154be4343d69a6a09a87a52f1bece4539f17485f15b97d4d6d4f567d00132334244d71b013344bfed38a5357bce230dfd387af40fdb376ac7d97</string>
+ <string>8ce3e2a25441da798375560ba51302dc239441a4320fd3eb10225a52ee3959fcb569f315c3e6a7d8a844f655fb6fdaac64cb9f57c05b3c484415381bb97e2130</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/7.31.3-0.5.2.1835/sentry-7.31.3-0.5.2-windows64-1835.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/164/packages/generic/sentry/7.31.3-0.6.0.1898/sentry-7.31.3-0.6.0-windows64-1898.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>7.31.3-0.5.2</string>
+ <string>7.31.3-0.6.0</string>
</map>
<key>slvoice</key>
<map>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 500bca0266a19b5123b052ea11c2d3fda0ef103d..c6dcd109f97fa5634f9cf6cbf05397042720822c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -172,10 +172,6 @@ elseif(LINUX)
libjpeg.so.8.2.2
)
- if (USE_SENTRY)
- list(APPEND release_files libsentry.so)
- endif ()
-
if (USE_FMODSTUDIO)
list(APPEND debug_files libfmodL.so)
list(APPEND release_files libfmod.so)
diff --git a/indra/cmake/Sentry.cmake b/indra/cmake/Sentry.cmake
index 7354cfb8b339dbea2689fb088d53cb7b3c49b8b5..d76d47fb6488a9cb8df33fd6132aeba8366dbfa4 100644
--- a/indra/cmake/Sentry.cmake
+++ b/indra/cmake/Sentry.cmake
@@ -18,7 +18,8 @@ if (USE_SENTRY)
include(OpenSSL)
include(ZLIBNG)
set(SENTRY_LIBRARIES
- ${ARCH_PREBUILT_DIRS_RELEASE}/libsentry.so
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libsentry.a
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libbreakpad_client.a
${CURL_LIBRARIES}
${NGHTTP2_LIBRARIES}
${OPENSSL_LIBRARIES}
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index 1b37d0c4a7ea6e21db500007b318de0fdf395f53..d0064dd3ee7d41d539f69d8073f810ed6fffc026 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -364,9 +364,10 @@ void LLAppViewerLinux::initCrashReporting(bool reportFreeze)
sentry_options_set_dsn(options, SENTRY_DSN);
sentry_options_set_release(options, LL_VIEWER_CHANNEL_AND_VERSION);
+#if 0
std::string crashpad_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "crashpad_handler");
sentry_options_set_handler_path(options, crashpad_path.c_str());
-
+#endif
std::string database_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "sentry");
sentry_options_set_database_path(options, database_path.c_str());
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index b460889f1154b6ebb92896f5c53720b755cf358f..35d6d7d687be504e53ec9cfcc98665b07f1e77ac 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1193,10 +1193,6 @@ def construct(self):
if self.args['fmodstudio'] == 'ON' or self.args['fmodstudio'] == 'TRUE':
self.path("libfmod.so*")
- # Sentry
- if self.args['sentry'] == 'ON' or self.args['sentry'] == 'TRUE':
- self.path("libsentry.so")
-
if self.args['discord'] == 'ON' or self.args['discord'] == 'TRUE':
self.path("libdiscord_game_sdk.so")
@@ -1205,11 +1201,6 @@ def construct(self):
self.path("SLVoice")
self.path("win32")
self.path("win64")
-
- # Sentry
- if self.args['sentry'] == 'ON' or self.args['sentry'] == 'TRUE':
- self.path("crashpad_handler")
-
with self.prefix(src=relpkgdir, dst="lib"):
self.path("libortp.so")
self.path("libsndfile.so.1")
@@ -1240,10 +1231,6 @@ def construct(self):
if self.args['fmodstudio'] == 'ON' or self.args['fmodstudio'] == 'TRUE':
self.path("libfmod.so*")
- # Sentry
- if self.args['sentry'] == 'ON' or self.args['sentry'] == 'TRUE':
- self.path("libsentry.so")
-
if self.args['discord'] == 'ON' or self.args['discord'] == 'TRUE':
self.path("libdiscord_game_sdk.so")
@@ -1252,11 +1239,6 @@ def construct(self):
self.path("SLVoice")
self.path("win32")
self.path("win64")
-
- # Sentry
- if self.args['sentry'] == 'ON' or self.args['sentry'] == 'TRUE':
- self.path("crashpad_handler")
-
with self.prefix(src=relpkgdir, dst="lib"):
self.path("libortp.so")
self.path("libsndfile.so.1")