Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index aba66d3..8c34ed3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -299,5 +299,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         /// <param name="b"></param>
         /// <returns></returns>
         LSL_Float osMax(double a, double b);
+
+        /// <summary>
+        /// Get the key of the object that rezzed this object.
+        /// </summary>
+        /// <returns>Rezzing object key or NULL_KEY if rezzed by agent or otherwise unknown.</returns>
+        LSL_Key osGetRezzingObject();
     }
 }