summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-08-31 20:51:40 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-08-31 20:51:40 +0100
commitd556a8a9741c367d8592cedbd2d8ef2255370a4c (patch)
tree61ac247f928ead716e99abbea4f04973dbd9df1a
parent9cc0510b4efe800bb5a2188001746d44979c494a (diff)
SL-13834 - omit string-type controls from preference logs
-rw-r--r--indra/llxml/llcontrol.cpp2
-rw-r--r--indra/newview/llviewerstats.cpp2
2 files changed, 2 insertions, 2 deletions
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);
}