From 654f6ad59daffbd72aa3c568cf72d77cb5ffa2d1 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 14 May 2023 19:21:37 -0400
Subject: [PATCH] Decrufting
---
indra/llcommon/llapp.h | 4 ---
indra/newview/llappviewer.cpp | 39 ------------------------------
indra/newview/llappviewerwin32.cpp | 12 ---------
indra/newview/llappviewerwin32.h | 2 --
4 files changed, 57 deletions(-)
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index 8740cb8000b..80288e1d82d 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -281,10 +281,6 @@ class LL_COMMON_API LLApp
*/
LLRunner& getRunner() { return mRunner; }
-#ifdef LL_WINDOWS
- virtual void reportCrashToBugsplat(void* pExcepInfo /*EXCEPTION_POINTERS*/) { }
-#endif
-
virtual void setCrashUserMetadata(const LLUUID& user_id, const std::string& avatar_name) {};
public:
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 423c662551e..0e21c925dea 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3610,45 +3610,6 @@ void LLAppViewer::writeSystemInfo()
writeDebugInfo(); // Save out debug_info.log early, in case of crash.
}
-#ifdef LL_WINDOWS
-//For whatever reason, in Windows when using OOP server for breakpad, the callback to get the
-//name of the dump file is not getting triggered by the breakpad library. Unfortunately they
-//also didn't see fit to provide a simple query request across the pipe to get this name either.
-//Since we are putting our output in a runtime generated directory and we know the header data in
-//the dump format, we can however use the following hack to identify our file.
-// TODO make this a member function.
-void getFileList()
-{
- std::stringstream filenames;
-
- typedef std::vector<std::string> vec;
- std::string pathname = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"");
- vec file_vec = gDirUtilp->getFilesInDir(pathname);
- for(vec::const_iterator iter=file_vec.begin(); iter!=file_vec.end(); ++iter)
- {
- filenames << *iter << " ";
- if ( ( iter->length() > 30 ) && (iter->rfind(".dmp") == (iter->length()-4) ) )
- {
- std::string fullname = pathname + *iter;
- llifstream fdat( fullname.c_str(), std::ifstream::binary);
- if (fdat)
- {
- char buf[5];
- fdat.read(buf,4);
- fdat.close();
- if (!strncmp(buf,"MDMP",4))
- {
- gDebugInfo["Dynamic"]["MinidumpPath"] = fullname;
- break;
- }
- }
- }
- }
- filenames << std::endl;
- gDebugInfo["Dynamic"]["DumpDirContents"] = filenames.str();
-}
-#endif
-
void LLAppViewer::handleViewerCrash()
{
LL_INFOS("CRASHREPORT") << "Handle viewer crash entry." << LL_ENDL;
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 92062e38399..747b72fbba5 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -625,18 +625,6 @@ bool LLAppViewerWin32::cleanup()
return result;
}
-void LLAppViewerWin32::reportCrashToBugsplat(void* pExcepInfo)
-{
-#if defined(AL_SENTRY)
- if (mSentryInitialized)
- {
- sentry_ucontext_s exc_context = {};
- exc_context.exception_ptrs = *(EXCEPTION_POINTERS*)pExcepInfo;
- sentry_handle_exception(&exc_context);
- }
-#endif
-}
-
void LLAppViewerWin32::setCrashUserMetadata(const LLUUID& user_id, const std::string& avatar_name)
{
#if defined(AL_SENTRY)
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h
index 04c58478050..1bce123be08 100644
--- a/indra/newview/llappviewerwin32.h
+++ b/indra/newview/llappviewerwin32.h
@@ -43,8 +43,6 @@ class LLAppViewerWin32 final : public LLAppViewer
bool init() override; // Override to do application initialization
bool cleanup() override;
- void reportCrashToBugsplat(void* pExcepInfo) override;
-
void setCrashUserMetadata(const LLUUID& user_id, const std::string& avatar_name) override;
protected:
--
GitLab