summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2020-09-22 13:07:39 -0700
committerCallum Prentice <callum@gmail.com>2020-09-22 13:07:39 -0700
commit38faec3b11d27c2f88b89283fe1a3a60d6ec4e42 (patch)
treecc2c7f22a38a2efba72eeb01124c3f873c3a1f83 /indra/newview/llappviewerwin32.cpp
parent14b5d490c37d234db7a52295502b130723186f3c (diff)
parent60ed688026269568a9eef67437dc780f88c92871 (diff)
Merge branch 'master' into DRTVWR-519
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 1c9f3af1e6..84ffb3551d 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