diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-09 00:42:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-09 00:42:36 +0300 |
commit | f56ef28ccf168b5f9d42a9d405924ca604326ff7 (patch) | |
tree | 13b45d4c6f677c50721036c637b56f21e7cd2c64 /indra/newview/llworld.cpp | |
parent | 94a66b558401c77953c990a992a91c7b32493f82 (diff) | |
parent | 9fdca96f8bd2211a99fe88e57b70cbecefa20b6d (diff) |
Merge pull request #1944 from Ansariel/develop_c4244
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r-- | indra/newview/llworld.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 6470c81aaa..014d4134f5 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -805,10 +805,10 @@ void LLWorld::updateNetStats() add(LLStatViewer::PACKETS_OUT, packets_out); add(LLStatViewer::PACKETS_LOST, packets_lost); - F32 total_packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); - if (total_packets_in > 0) + F32 total_packets_in = (F32)LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); + if (total_packets_in > 0.f) { - F32 total_packets_lost = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_LOST); + F32 total_packets_lost = (F32)LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_LOST); sample(LLStatViewer::PACKETS_LOST_PERCENT, LLUnits::Ratio::fromValue((F32)total_packets_lost/(F32)total_packets_in)); } |