Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2026-08-06 09:16:28 +08:00 · 2012-08-03 16:46:11 +01:00
parent ecffcf7f65 513b77b78d
commit 0c00abcce1
20 changed files with 465 additions and 305 deletions
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -945,5 +945,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        {
            return m_OSSL_Functions.osMax(a, b);
        }
+
+        public LSL_Key osGetRezzingObject()
+        {
+            return m_OSSL_Functions.osGetRezzingObject();
+        }
    }
 }