diff options
| author | Richard Linden <none@none> | 2013-08-18 22:30:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-18 22:30:27 -0700 |
| commit | 612892b45a3413b16e40c49d3bfde77a4ca927fd (patch) | |
| tree | 2272a24c7f0a8354791f74c7485a376abb377f67 /indra/llcommon/llsys.h | |
| parent | f8e3a34348ab98ecd56d53360b8f2b6512ad6bba (diff) | |
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
Diffstat (limited to 'indra/llcommon/llsys.h')
| -rwxr-xr-x | indra/llcommon/llsys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index ad4f243d05..962367f69f 100755 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -112,7 +112,7 @@ public: LLMemoryInfo(); ///< Default constructor void stream(std::ostream& s) const; ///< output text info to s - U32Kibibytes getPhysicalMemoryKB() const; + U32Kilobytes getPhysicalMemoryKB() const; /*! Memory size in bytes, if total memory is >= 4GB then U32_MAX will ** be returned. @@ -120,7 +120,7 @@ public: U32Bytes getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes //get the available memory infomation in KiloBytes. - static void getAvailableMemoryKB(U32Kibibytes& avail_physical_mem_kb, U32Kibibytes& avail_virtual_mem_kb); + static void getAvailableMemoryKB(U32Kilobytes& avail_physical_mem_kb, U32Kilobytes& avail_virtual_mem_kb); // Retrieve a map of memory statistics. The keys of the map are platform- // dependent. The values are in kilobytes to try to avoid integer overflow. |