summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-08-21 19:28:19 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-08-21 19:28:19 -0400
commit302052700b4605605808b90bed8fb1c5a93ece22 (patch)
treeefb79ccbd07b631afb5cb070c988c59e39119914 /indra/newview
parent87763d964a95bc918e26ae35932a99d56961f159 (diff)
DRTVWR-447: Add static_debug_info.log file to Windows crash report.
Also use the LLOSInfo information for platform rather than simply Windows32 or Windows64.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewerwin32.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index adb340d40e..9f85ca3edf 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -126,9 +126,14 @@ namespace
sBugSplatSender->sendAdditionalFile(
WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings.xml")));
+ sBugSplatSender->sendAdditionalFile(
+ WCSTR(*LLAppViewer::instance()->getStaticDebugFile()));
+
// We don't have an email address for any user. Hijack this
// metadata field for the platform identifier.
- sBugSplatSender->setDefaultUserEmail(WCSTR(STRINGIZE("Windows" << ADDRESS_SIZE)));
+ sBugSplatSender->setDefaultUserEmail(
+ WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " ("
+ << ADDRESS_SIZE << "-bit)")));
if (gAgentAvatarp)
{