diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 1181c10..0bb933c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -3362,5 +3362,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3362 | 3362 | ||
3363 | return Math.Max(a, b); | 3363 | return Math.Max(a, b); |
3364 | } | 3364 | } |
3365 | |||
3366 | public LSL_Key osGetRezzingObject() | ||
3367 | { | ||
3368 | CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject"); | ||
3369 | m_host.AddScriptLPS(1); | ||
3370 | |||
3371 | return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); | ||
3372 | } | ||
3365 | } | 3373 | } |
3366 | } | 3374 | } |