summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-09-23 20:20:27 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-09-23 20:20:27 +0100
commit1cba874abf6f955cf52d68c30c3230ec58528057 (patch)
treeaab7c3a11e440fdb8c1e70f2c625e6f6034cf2c2 /indra/newview/llappviewerwin32.cpp
parent1049f15c9cbb3d9fdd3f1f8529b7ca46c5f2b7f3 (diff)
parent60ed688026269568a9eef67437dc780f88c92871 (diff)
Merge remote-tracking branch 'origin/master' into DRTVWR-517
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r--indra/newview/llappviewerwin32.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 156a1c5893..9b1c0d1f8b 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -139,6 +139,9 @@ namespace
{
// user name, when we have it
sBugSplatSender->setDefaultUserName(WCSTR(gAgentAvatarp->getFullname()));
+
+ sBugSplatSender->sendAdditionalFile(
+ WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "settings_per_account.xml")));
}
// LL_ERRS message, when there is one