From a08687aef35079f6c2884d3ae6fd8307ca8a6b0d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 Aug 2012 01:18:35 +0100
Subject: 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.
---
.../Shared/Api/Implementation/OSSL_Api.cs | 50 ----------------------
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 7 ---
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 ---
3 files changed, 62 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine')
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
return new LSL_Key(m_host.ParentGroup.FromPartID.ToString());
}
-
- public void osRezDuplicate(LSL_Vector offset, LSL_Rotation rot)
- {
- CheckThreatLevel(ThreatLevel.High, "osRezDuplicate");
- m_host.AddScriptLPS(1);
-
- Vector3 v = new Vector3((float)offset.x, (float)offset.y, (float)offset.z);
- Quaternion r = new Quaternion(
- (float)rot.x,
- (float)rot.y,
- (float)rot.z,
- (float)rot.s
- );
-
- Vector3 destination = m_host.ParentGroup.AbsolutePosition + v;
-
- if (!World.Permissions.CanRezObject(
- m_host.ParentGroup.PrimCount,
- m_host.OwnerID,
- destination
- ))
- {
- OSSLShoutError("Cannot duplicate object to destination, owner cannot rez objects at destination parcel.");
-
- ScriptSleep(100);
- }
- else
- {
- SceneObjectGroup duplicate = World.SceneGraph.DuplicateObject(
- m_host.ParentGroup.LocalId,
- v,
- m_host.ParentGroup.RootPart.GetEffectiveObjectFlags(),
- m_host.OwnerID,
- m_host.GroupID,
- r
- );
-
- m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
- "object_rez", new Object[] {
- new LSL_String(
- duplicate.RootPart.UUID.ToString()) },
- new DetectParams[0]));
-
- ScriptSleep(100);
- m_ScriptEngine.PostObjectEvent(duplicate.LocalId, new EventParams(
- "on_rez", new Object[]{
- new LSL_Integer(0)},
- new DetectParams[0]));
- }
- }
}
}
\ 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
///
/// Rezzing object key or NULL_KEY if rezzed by agent or otherwise unknown.
LSL_Key osGetRezzingObject();
-
- ///
- /// Duplicates an object as if the owner duplicated it.
- ///
- ///
- ///
- void osRezDuplicate(vector offset, rotation rot);
}
}
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
{
return m_OSSL_Functions.osGetRezzingObject();
}
-
- public void osRezDuplicate(vector offset, rotation rot)
- {
- m_OSSL_Functions.osRezDuplicate(offset, rot);
- }
}
}
--
cgit v1.1