Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

1 files changed, 10 insertions, 0 deletions

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();
+        }
     }
 }