diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/newview/llworld.cpp | |
parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
merge changes for 3.7.27-release
Diffstat (limited to 'indra/newview/llworld.cpp')
-rwxr-xr-x | indra/newview/llworld.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 74fb1ec78e..5d657f7eef 100755 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -795,9 +795,12 @@ void LLWorld::updateNetStats() add(LLStatViewer::PACKETS_IN, packets_in); add(LLStatViewer::PACKETS_OUT, packets_out); add(LLStatViewer::PACKETS_LOST, packets_lost); - if (packets_in) + + F32 total_packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); + if (total_packets_in > 0) { - sample(LLStatViewer::PACKETS_LOST_PERCENT, LLUnits::Ratio::fromValue((F32)packets_lost/(F32)packets_in)); + F32 total_packets_lost = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_LOST); + sample(LLStatViewer::PACKETS_LOST_PERCENT, LLUnits::Ratio::fromValue((F32)total_packets_lost/(F32)total_packets_in)); } mLastPacketsIn = gMessageSystem->mPacketsIn; |