diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-22 18:26:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-22 18:26:54 +0300 |
| commit | 6da0a6873b122b95b203633d3d5dda2b54c6fc43 (patch) | |
| tree | 5dd6927428e27ff1d1ce74a569a4cfe94528faf3 /indra/newview/llviewerstats.cpp | |
| parent | 0ed270a0569e205f837f84773f5e72ab3b46d01b (diff) | |
| parent | ef2decdbe9fd2add86f1117f423b680a3b79f927 (diff) | |
Merge branch 'SL-14862' into DRTVWR-518-ui
# Conflicts:
# indra/newview/llstartup.cpp
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rw-r--r-- | indra/newview/llviewerstats.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 05f88b0a75..314c1a1f1e 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -63,6 +63,7 @@ #include "llsdutil.h" #include "llcorehttputil.h" #include "llvoicevivox.h" +#include "lluiusage.h" namespace LLStatViewer { @@ -577,6 +578,8 @@ void send_viewer_stats(bool include_preferences) fail["invalid"] = (S32) gMessageSystem->mInvalidOnCircuitPackets; fail["missing_updater"] = (S32) LLAppViewer::instance()->isUpdaterMissing(); + body["ui"] = LLUIUsage::instance().asLLSD(); + body["stats"]["voice"] = LLVoiceVivoxStats::getInstance()->read(); // Misc stats, two strings and two ints |