From 963cf25813ad2bd6dceaa39757391fbf94d6f09e Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 13 Dec 2009 03:04:16 +1100
Subject: * Implements OSSL function: osGetSimulatorMemory - returns the
 current amount of memory allocated to the simulator process (Moderate Threat
 Level). * Cleans redundant information out of the Simulator Version. Versions
 now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log
 info for MySQLInventoryData

---
 OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 519463e..2876ad6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -637,5 +637,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 		{
 			return m_OSSL_Functions.osGetRegionStats();
 		}
+
+        /// <summary>
+        /// Returns the amount of memory in use by the Simulator Daemon.
+        /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware)
+        /// </summary>
+        /// <returns></returns>
+        public LSL_Integer osGetSimulatorMemory()
+        {
+            return m_OSSL_Functions.osGetSimulatorMemory();
+        }
     }
 }
-- 
cgit v1.1