diff options
| author | Richard Linden <none@none> | 2013-08-19 10:20:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-19 10:20:55 -0700 |
| commit | 08eb52c10ca1f916d937fe1927eb659f6d69a6d3 (patch) | |
| tree | 98e7faecca7ded1dd8732dfef7c13abd424b858b /indra/newview/llfloaterabout.cpp | |
| parent | 4290365ebbf5505bee4fbed8043996fa7687fd03 (diff) | |
| parent | 612892b45a3413b16e40c49d3bfde77a4ca927fd (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rwxr-xr-x | indra/newview/llfloaterabout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index ad94949863..7f81d40ebb 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -259,7 +259,7 @@ LLSD LLFloaterAbout::getInfo() // CPU info["CPU"] = gSysCPU.getCPUString(); - info["MEMORY_MB"] = LLSD::Integer(gSysMemory.getPhysicalMemoryKB().valueInUnits<LLUnits::Mibibytes>()); + info["MEMORY_MB"] = LLSD::Integer(gSysMemory.getPhysicalMemoryKB().valueInUnits<LLUnits::Megabytes>()); // Moved hack adjustment to Windows memory size into llsys.cpp info["OS_VERSION"] = LLAppViewer::instance()->getOSInfo().getOSString(); info["GRAPHICS_CARD_VENDOR"] = (const char*)(glGetString(GL_VENDOR)); |