Merge branch 'master' into careminster

2026-08-05 08:55:56 +08:00 · 2009-12-14 00:40:56 +00:00
parent 30d64444a0 0813dc8c1d
commit 824d7190c2
10 changed files with 337 additions and 222 deletions
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -163,5 +163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
        key osGetMapTexture();
        key osGetRegionMapTexture(string regionName);
 		LSL_List osGetRegionStats();
+
+        int osGetSimulatorMemory();
    }
 }