From d556a8a9741c367d8592cedbd2d8ef2255370a4c Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 31 Aug 2020 20:51:40 +0100 Subject: SL-13834 - omit string-type controls from preference logs --- indra/llxml/llcontrol.cpp | 2 +- indra/newview/llviewerstats.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 00a6c08ba4..ead8634df4 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -649,7 +649,7 @@ LLSD LLControlGroup::asLLSD(bool diffs_only) iter != mNameTable.end(); iter++) { LLControlVariable *control = iter->second; - if (!control || (diffs_only && control->isDefault())) + if (!control || control->isType(TYPE_STRING) || (diffs_only && control->isDefault())) { continue; } diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 013757589c..a1e3597ac0 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -622,7 +622,7 @@ void send_viewer_stats(bool include_preferences) // Preferences if (include_preferences) { - bool diffs_only = true; // only log preferences that differ from default + bool diffs_only = true; // only log preferences that differ from default? body["preferences"]["settings"] = gSavedSettings.asLLSD(diffs_only); body["preferences"]["settings_per_account"] = gSavedPerAccountSettings.asLLSD(diffs_only); } -- cgit v1.2.3