diff options
| author | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:28:35 -0800 |
|---|---|---|
| committer | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:29:37 -0800 |
| commit | 0b95b9d008a0878b5d57262e529cef61fb29ea24 (patch) | |
| tree | 6e12a7949c9a69a5e1ad170220b4e9a82a453142 /indra/newview/llappviewerwin32.cpp | |
| parent | f729cfc33f258781c5fd85a3d8773bf6149d12db (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into SL-15742
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 25d18fa11f..5556ec8f76 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -118,16 +118,22 @@ namespace { if (nCode == MDSCB_EXCEPTIONCODE) { - // send the main viewer log file + // send the main viewer log file, one per instance // widen to wstring, convert to __wchar_t, then pass c_str() sBugSplatSender->sendAdditionalFile( - WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLife.log"))); + WCSTR(LLError::logFileName())); - sBugSplatSender->sendAdditionalFile( - WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings.xml"))); + // second instance does not have some log files + // TODO: This needs fixing, if each instance now has individual logs, + // same should be made true for static debug files + if (!LLAppViewer::instance()->isSecondInstance()) + { + sBugSplatSender->sendAdditionalFile( + WCSTR(*LLAppViewer::instance()->getStaticDebugFile())); + } sBugSplatSender->sendAdditionalFile( - WCSTR(*LLAppViewer::instance()->getStaticDebugFile())); + WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings.xml"))); // We don't have an email address for any user. Hijack this // metadata field for the platform identifier. |