Second Life viewer sources 1.18.3.2-RC

1 files changed, 22 insertions, 4 deletions

diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h
index 416bd54..66a3465 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -89,13 +89,31 @@ private:
         std::string mCPUString;
 };
 
+//=============================================================================
+//
+//      CLASS           LLMemoryInfo
+
 class LLMemoryInfo
+
+/*!     @brief          Class to query the memory subsystem
+
+        @details
+                Here's how you use an LLMemoryInfo:
+                
+                LLMemoryInfo info;
+<br>    llinfos << info << llendl;
+*/
 {
 public:
-        LLMemoryInfo();
-        void stream(std::ostream& s) const;
-
-        U32 getPhysicalMemory() const;
+        LLMemoryInfo(); ///< Default constructor
+        void stream(std::ostream& s) const;     ///< output text info to s
+
+        U32 getPhysicalMemoryKB() const; ///< Memory size in KiloBytes
+        
+        /*! Memory size in bytes, if total memory is >= 4GB then U32_MAX will
+        **  be returned.
+        */
+        U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
 };