diff options
| author | Melanie | 2012-08-03 16:46:11 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-03 16:46:11 +0100 |
| commit | 0c00abcce18d00ae151a7340b808ffe8d7e200ef (patch) | |
| tree | 3f19d7653c984120f16b3a2ea74ccf6b34928a2e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff) | |
| download | opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.zip opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.gz opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.bz2 opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -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 | } |