llcommon merge. Added LLUnits.

2016-04-06 01:31:20 -05:00
parent 0fa7848b19
commit 0841479ccc
66 changed files with 1895 additions and 621 deletions
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -233,7 +233,7 @@ LLFloaterAbout::LLFloaterAbout()
 	else
 		support.append(" None\n"); */

-	U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024;
+	U32Megabytes memory = gSysMemory.getPhysicalMemoryKB();
 	// Moved hack adjustment to Windows memory size into llsys.cpp

 	std::string mem_text = llformat("Memory: %u MB\n", memory );