diff options
| author | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
| commit | 08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch) | |
| tree | caa4327b04a438978fd9bae207ea86269f1525b6 /indra/newview/llviewerstats.cpp | |
| parent | b2eb85df79f317d2b587c969178cea9b96c81213 (diff) | |
| parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) | |
Automated merge with tip of viewer-release
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 db2897d387..15b2ac8acf 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -62,6 +62,7 @@ #include "llmeshrepository.h" //for LLMeshRepository::sBytesReceived #include "llsdserialize.h" #include "llcorehttputil.h" +#include "llvoicevivox.h" namespace LLStatViewer { @@ -570,6 +571,8 @@ void send_stats() fail["off_circuit"] = (S32) gMessageSystem->mOffCircuitPackets; fail["invalid"] = (S32) gMessageSystem->mInvalidOnCircuitPackets; + body["stats"]["voice"] = LLVoiceVivoxStats::getInstance()->read(); + // Misc stats, two strings and two ints // These are not expecticed to persist across multiple releases // Comment any changes with your name and the expected release revision |