diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
| commit | 197a1ddef8a0b7bc7872339ec82b2a5bc5cbb3b4 (patch) | |
| tree | 31b2bf3eeb026334ed20cd6e4f8fb15f91a07b0f /indra/newview/llappviewerwin32.cpp | |
| parent | 5a6174c0853f5a140343725312f2b63b42f2bbad (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
DRTVWR-589: Merge branch 'main' into DRTVWR-589
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 298d841934..8cf80f388b 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -720,13 +720,15 @@ bool LLAppViewerWin32::init() DWORD dwFlags = MDSF_NONINTERACTIVE | // automatically submit report without prompting MDSF_PREVENTHIJACKING; // disallow swiping Exception filter - bool needs_log_file = !isSecondInstance() && debugLoggingEnabled("BUGSPLAT"); + bool needs_log_file = !isSecondInstance(); + LL_DEBUGS("BUGSPLAT"); if (needs_log_file) { // Startup only! LL_INFOS("BUGSPLAT") << "Engaged BugSplat logging to bugsplat.log" << LL_ENDL; dwFlags |= MDSF_LOGFILE | MDSF_LOG_VERBOSE; } + LL_ENDL; // have to convert normal wide strings to strings of __wchar_t sBugSplatSender = new MiniDmpSender( @@ -737,12 +739,14 @@ bool LLAppViewerWin32::init() dwFlags); sBugSplatSender->setCallback(bugsplatSendLog); + LL_DEBUGS("BUGSPLAT"); if (needs_log_file) { // Log file will be created in %TEMP%, but it will be moved into logs folder in case of crash std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "bugsplat.log"); sBugSplatSender->setLogFilePath(WCSTR(log_file)); } + LL_ENDL; // engage stringize() overload that converts from wstring LL_INFOS("BUGSPLAT") << "Engaged BugSplat(" << LL_TO_STRING(LL_VIEWER_CHANNEL) |