diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
| commit | 8897e7ca24533e0093825346391f5fa9a37f2427 (patch) | |
| tree | 781b08a7a90e53124d4f11b507be4d726544f0f0 /indra/newview/llappviewer.cpp | |
| parent | 79ab7c20703c092a4416a4f9a885e0246fc17ee0 (diff) | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
Merge. Refresh from viewer-release after 3.7.16 release.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 24150daea4..3a5008507a 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3368,11 +3368,11 @@ LLSD LLAppViewer::getViewerInfo() const // TODO: Implement media plugin version query info["QT_WEBKIT_VERSION"] = "4.7.1 (version number hard-coded)"; - if (gPacketsIn > 0) + S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); + if (packets_in > 0) { - LLTrace::Recording& last_frame = LLTrace::get_frame_recording().getLastRecording(); - info["PACKETS_LOST"] = last_frame.getSum(LLStatViewer::PACKETS_LOST); - info["PACKETS_IN"] = last_frame.getSum(LLStatViewer::PACKETS_IN); + info["PACKETS_LOST"] = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_LOST); + info["PACKETS_IN"] = packets_in; info["PACKETS_PCT"] = 100.f*info["PACKETS_LOST"].asReal() / info["PACKETS_IN"].asReal(); } |