From e59ad68207ff626db16e6d0d7e4cd4552182aef1 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 22 Jun 2021 12:02:42 -0400
Subject: [PATCH] Small revert to fix broken texture memory
---
indra/llcommon/llsys.cpp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index d9e64919a94..096e40066d4 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -882,14 +882,13 @@ LLSD LLMemoryInfo::loadStatsMap()
GlobalMemoryStatusEx(&state);
DWORDLONG div = 1024;
- DWORDLONG div_mb = 1024 * 1024;
stats.add("Percent Memory use", state.dwMemoryLoad);
- stats.add("Total Physical MB", state.ullTotalPhys/div_mb);
- stats.add("Avail Physical MB", state.ullAvailPhys/div_mb);
- stats.add("Total page MB", state.ullTotalPageFile/div_mb);
- stats.add("Avail page MB", state.ullAvailPageFile/div_mb);
- stats.add("Total Virtual MB", state.ullTotalVirtual/div_mb);
- stats.add("Avail Virtual MB", state.ullAvailVirtual/div_mb);
+ stats.add("Total Physical KB", state.ullTotalPhys/div);
+ stats.add("Avail Physical KB", state.ullAvailPhys/div);
+ stats.add("Total page KB", state.ullTotalPageFile/div);
+ stats.add("Avail page KB", state.ullAvailPageFile/div);
+ stats.add("Total Virtual KB", state.ullTotalVirtual/div);
+ stats.add("Avail Virtual KB", state.ullAvailVirtual/div);
// SL-12122 - Call to GetPerformanceInfo() was removed here. Took
// on order of 10 ms, causing unacceptable frame time spike every
--
GitLab