From 9cc0510b4efe800bb5a2188001746d44979c494a Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 26 Aug 2020 16:06:29 +0100 Subject: SL-13834 - add preferences info to ViewerStats, only when exiting and different from default --- indra/newview/llviewerstats.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerstats.cpp') diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index f7ded00318..013757589c 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -60,6 +60,7 @@ #include "llviewernetwork.h" #include "llmeshrepository.h" //for LLMeshRepository::sBytesReceived #include "llsdserialize.h" +#include "llsdutil.h" #include "llcorehttputil.h" #include "llvoicevivox.h" @@ -425,7 +426,7 @@ void update_statistics() * If you move stats around here, make the corresponding changes in * those locations, too. */ -void send_stats() +void send_viewer_stats(bool include_preferences) { // IW 9/23/02 I elected not to move this into LLViewerStats // because it depends on too many viewer.cpp globals. @@ -617,10 +618,25 @@ void send_stats() body["DisplayNamesEnabled"] = gSavedSettings.getBOOL("UseDisplayNames"); body["DisplayNamesShowUsername"] = gSavedSettings.getBOOL("NameTagShowUsernames"); - + + // Preferences + if (include_preferences) + { + 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); + } + body["MinimalSkin"] = false; + LL_INFOS("LogViewerStatsPacket") << "Sending viewer statistics: " << body << LL_ENDL; + if (debugLoggingEnabled("LogViewerStatsPacket")) + { + std::string filename("viewer_stats_packet.xml"); + llofstream of(filename.c_str()); + LLSDSerialize::toPrettyXML(body,of); + } // The session ID token must never appear in logs body["session_id"] = gAgentSessionID; -- cgit v1.2.3 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/newview/llviewerstats.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerstats.cpp') 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 From c6ae8017da0cb433b24560c9a721ea25ea3396b7 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 1 Sep 2020 15:14:49 +0100 Subject: SL-13834 - small correction --- indra/newview/llviewerstats.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerstats.cpp') diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index a1e3597ac0..013757589c 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 From 9d5c64dddc928fb5aa0cd03c4b3d68a1ea6173cf Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 10 Nov 2020 13:11:08 +0000 Subject: SL-14264 - ViewerStats added logging of most gGLManager fields --- indra/newview/llviewerstats.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llviewerstats.cpp') diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 013757589c..7533c0c789 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -514,6 +514,8 @@ void send_viewer_stats(bool include_preferences) system["gpu_version"] = gGLManager.mDriverVersionVendorString; system["opengl_version"] = gGLManager.mGLVersionString; + gGLManager.asLLSD(system["gl"]); + S32 shader_level = 0; if (LLPipeline::sRenderDeferred) { -- cgit v1.2.3 From 4ba1ea1a651a5ecd11750090b7967356fa0b32d3 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 15 Jan 2021 00:35:20 +0200 Subject: SL-14283 Don't crash viewer, only show a notification --- indra/newview/llviewerstats.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llviewerstats.cpp') diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 7533c0c789..05f88b0a75 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -575,6 +575,7 @@ void send_viewer_stats(bool include_preferences) fail["failed_resends"] = (S32) gMessageSystem->mFailedResendPackets; fail["off_circuit"] = (S32) gMessageSystem->mOffCircuitPackets; fail["invalid"] = (S32) gMessageSystem->mInvalidOnCircuitPackets; + fail["missing_updater"] = (S32) LLAppViewer::instance()->isUpdaterMissing(); body["stats"]["voice"] = LLVoiceVivoxStats::getInstance()->read(); -- cgit v1.2.3