diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index d99f6363aa..484cb66130 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -1025,7 +1025,7 @@ LLSD FSData::getSystemInfo() sysinfo1 += llformat("%s\n\n", info["SERVER_VERSION"].asString().c_str()); sysinfo1 += llformat("CPU: %s\n", info["CPU"].asString().c_str()); - sysinfo1 += llformat("Memory: %d MB\n", info["MEMORY_MB"].asInteger()); + sysinfo1 += llformat("Memory: %d MB (Used: %d MB)\n", info["MEMORY_MB"].asInteger(), info["USED_RAM"].asInteger()); sysinfo1 += llformat("OS: %s\n", info["OS_VERSION"].asString().c_str()); sysinfo1 += llformat("Graphics Card Vendor: %s\n", info["GRAPHICS_CARD_VENDOR"].asString().c_str()); sysinfo1 += llformat("Graphics Card: %s\n", info["GRAPHICS_CARD"].asString().c_str()); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 928daf17f6..33158dc2de 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -50,7 +50,7 @@ You are in [REGION] and this info sometimes gets sent to support. --> CPU: [CPU] -Memory: [MEMORY_MB] MB +Memory: [MEMORY_MB] MB (Used: [USED_RAM] MB) Concurrency: [CONCURRENCY] OS Version: [OS_VERSION] Graphics Card Vendor: [GRAPHICS_CARD_VENDOR]