diff options
author | Justin Clark-Casey (justincc) | 2012-08-24 01:18:35 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-24 01:18:35 +0100 |
commit | a08687aef35079f6c2884d3ae6fd8307ca8a6b0d (patch) | |
tree | cd02f717d3e1f3cd78016d30310e880623deb798 | |
parent | implementing function to allow scripts to self-replicate as if the owner dupl... (diff) | |
download | opensim-SC_OLD-a08687aef35079f6c2884d3ae6fd8307ca8a6b0d.zip opensim-SC_OLD-a08687aef35079f6c2884d3ae6fd8307ca8a6b0d.tar.gz opensim-SC_OLD-a08687aef35079f6c2884d3ae6fd8307ca8a6b0d.tar.bz2 opensim-SC_OLD-a08687aef35079f6c2884d3ae6fd8307ca8a6b0d.tar.xz |
Revert "implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()"
This reverts commit 2ad9d656b3a1a0c519c9599d7680f98eba7e82b8.
Reverted pending consideration of associated issues.
3 files changed, 0 insertions, 62 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 119c2ac..5e7c2d9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -3344,55 +3344,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3344 | 3344 | ||
3345 | return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); | 3345 | return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); |
3346 | } | 3346 | } |
3347 | |||
3348 | public void osRezDuplicate(LSL_Vector offset, LSL_Rotation rot) | ||
3349 | { | ||
3350 | CheckThreatLevel(ThreatLevel.High, "osRezDuplicate"); | ||
3351 | m_host.AddScriptLPS(1); | ||
3352 | |||
3353 | Vector3 v = new Vector3((float)offset.x, (float)offset.y, (float)offset.z); | ||
3354 | Quaternion r = new Quaternion( | ||
3355 | (float)rot.x, | ||
3356 | (float)rot.y, | ||
3357 | (float)rot.z, | ||
3358 | (float)rot.s | ||
3359 | ); | ||
3360 | |||
3361 | Vector3 destination = m_host.ParentGroup.AbsolutePosition + v; | ||
3362 | |||
3363 | if (!World.Permissions.CanRezObject( | ||
3364 | m_host.ParentGroup.PrimCount, | ||
3365 | m_host.OwnerID, | ||
3366 | destination | ||
3367 | )) | ||
3368 | { | ||
3369 | OSSLShoutError("Cannot duplicate object to destination, owner cannot rez objects at destination parcel."); | ||
3370 | |||
3371 | ScriptSleep(100); | ||
3372 | } | ||
3373 | else | ||
3374 | { | ||
3375 | SceneObjectGroup duplicate = World.SceneGraph.DuplicateObject( | ||
3376 | m_host.ParentGroup.LocalId, | ||
3377 | v, | ||
3378 | m_host.ParentGroup.RootPart.GetEffectiveObjectFlags(), | ||
3379 | m_host.OwnerID, | ||
3380 | m_host.GroupID, | ||
3381 | r | ||
3382 | ); | ||
3383 | |||
3384 | m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams( | ||
3385 | "object_rez", new Object[] { | ||
3386 | new LSL_String( | ||
3387 | duplicate.RootPart.UUID.ToString()) }, | ||
3388 | new DetectParams[0])); | ||
3389 | |||
3390 | ScriptSleep(100); | ||
3391 | m_ScriptEngine.PostObjectEvent(duplicate.LocalId, new EventParams( | ||
3392 | "on_rez", new Object[]{ | ||
3393 | new LSL_Integer(0)}, | ||
3394 | new DetectParams[0])); | ||
3395 | } | ||
3396 | } | ||
3397 | } | 3347 | } |
3398 | } \ No newline at end of file | 3348 | } \ No newline at end of file |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 8c90df4..9ad1c22 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -306,12 +306,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
306 | /// </summary> | 306 | /// </summary> |
307 | /// <returns>Rezzing object key or NULL_KEY if rezzed by agent or otherwise unknown.</returns> | 307 | /// <returns>Rezzing object key or NULL_KEY if rezzed by agent or otherwise unknown.</returns> |
308 | LSL_Key osGetRezzingObject(); | 308 | LSL_Key osGetRezzingObject(); |
309 | |||
310 | /// <summary> | ||
311 | /// Duplicates an object as if the owner duplicated it. | ||
312 | /// </summary> | ||
313 | /// <param name="offset"></param> | ||
314 | /// <param name="rot"></param> | ||
315 | void osRezDuplicate(vector offset, rotation rot); | ||
316 | } | 309 | } |
317 | } | 310 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 9a2f859..e9131e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -955,10 +955,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
955 | { | 955 | { |
956 | return m_OSSL_Functions.osGetRezzingObject(); | 956 | return m_OSSL_Functions.osGetRezzingObject(); |
957 | } | 957 | } |
958 | |||
959 | public void osRezDuplicate(vector offset, rotation rot) | ||
960 | { | ||
961 | m_OSSL_Functions.osRezDuplicate(offset, rot); | ||
962 | } | ||
963 | } | 958 | } |
964 | } | 959 | } |