livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only send per account settings file if user opted in to send settings files

meow-7.2.2
Ansariel 2020-05-26 22:15:08 +02:00
parent db41596b1a
commit 60dc71dda3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llappviewerwin32.cpp
View File

@ -172,8 +172,15 @@ namespace
}
// </FS:ND>
sBugSplatSender->sendAdditionalFile(
WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "settings_per_account.xml")));
//<FS:Ansariel> Only include if sending settings file
//sBugSplatSender->sendAdditionalFile(
// WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "settings_per_account.xml")));
if (gCrashSettings.getBOOL("CrashSubmitSettings"))
{
sBugSplatSender->sendAdditionalFile(
WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "settings_per_account.xml")));
}
// <FS:Ansariel>
}
// LL_ERRS message, when there is one

2
indra/newview/skins/default/xui/de/panel_preferences_crashreports.xml
View File

@ -2,7 +2,7 @@
<panel label="Absturzmeldungen" name="crash_reports">
<check_box label="Absturzmeldungen an firestormviewer.org senden" name="checkSendCrashReports"/>
<check_box label="Vor dem Senden immer fragen" name="checkSendCrashReportsAlwaysAsk"/>
<check_box label="Firestorm-Konfigurationsdatei settings.xml einschließen" name="checkSendSettings"/>
<check_box label="Firestorm-Konfigurationsdateien einschließen" name="checkSendSettings"/>
<text name="textSendSettings">
(enthält Benutzername)
</text>

2
indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
View File

@ -39,7 +39,7 @@
follows="top|left"
top_pad="5"
height="16"
label="Include settings.xml"
label="Include settings files"
name="checkSendSettings"
width="130"
enabled="false" />