diff options
| author | Richard Linden <none@none> | 2012-11-08 23:42:18 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-08 23:42:18 -0800 |
| commit | 0bb0bd514b235948c1a21c81ab0e8ab6223b1990 (patch) | |
| tree | e0d49acc9074d0a5ed30c9c53fde908e5305b10f /indra/newview/llviewerstats.cpp | |
| parent | ed17c181dd37f56b808838748d289ee7bb5567ec (diff) | |
SH-3499 WIP Ensure asset stats output is correct
Finished making LLUnit implicitly convertible to/from scalar integer values
cleaned up test code
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rwxr-xr-x | indra/newview/llviewerstats.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 317fe5eaf8..36b1179e04 100755 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -288,13 +288,13 @@ F32 gAveLandCompression = 0.f, gWorstLandCompression = 0.f, gWorstWaterCompression = 0.f; -LLUnit::Bytes<U32> gTotalWorldData = 0, +LLUnit<LLUnits::Bytes, U32> gTotalWorldData = 0, gTotalObjectData = 0, gTotalTextureData = 0; U32 gSimPingCount = 0; -LLUnit::Bits<U32> gObjectData = 0; +LLUnit<LLUnits::Bits, U32> gObjectData = 0; F32 gAvgSimPing = 0.f; -LLUnit::Bytes<U32> gTotalTextureBytesPerBoostLevel[LLViewerTexture::MAX_GL_IMAGE_CATEGORY] = {0}; +LLUnit<LLUnits::Bytes, U32> gTotalTextureBytesPerBoostLevel[LLViewerTexture::MAX_GL_IMAGE_CATEGORY] = {0}; extern U32 gVisCompared; extern U32 gVisTested; |
