OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

restrict osDie to objects rezzed by the script object group and a few more changes

melanie
UbitUmarov 2016-12-14 16:08:25 +00:00
parent 95d6396300
commit 553b326fb2
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1882,33 +1882,41 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void osDie(LSL_Key objectUUID) public void osDie(LSL_Key objectUUID)
{ {
CheckThreatLevel(ThreatLevel.VeryHigh, "osDie"); // CheckThreatLevel(ThreatLevel.VeryHigh, "osDie");
// if this is restricted to objects rezzed by this host level can be reduced
CheckThreatLevel(ThreatLevel.Low, "osDie");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
UUID objUUID; UUID objUUID;
if (!UUID.TryParse(objectUUID, out objUUID)) // prior to patching, a thrown exception regarding invalid GUID format would be shouted instead. if (!UUID.TryParse(objectUUID, out objUUID))
{ {
OSSLShoutError("osDie() cannot delete objects with invalid UUIDs"); OSSLShoutError("osDie() cannot delete objects with invalid UUIDs");
return; return;
} }
DeleteObject(objUUID); // harakiri check
} if(objUUID == UUID.Zero)
throw new SelfDeleteException();
private void DeleteObject(UUID objUUID)
{
SceneObjectGroup sceneOG = World.GetSceneObjectGroup(objUUID); SceneObjectGroup sceneOG = World.GetSceneObjectGroup(objUUID);
if (sceneOG == null) // prior to patching, PostObjectEvent() would cause a throw exception to be shouted instead. if (sceneOG == null || sceneOG.IsDeleted)
{ return;
OSSLShoutError("osDie() cannot delete " + objUUID.ToString() + ", object was not found in scene.");
if(sceneOG.IsAttachment)
return; return;
}
if (sceneOG.OwnerID != m_host.OwnerID) if (sceneOG.OwnerID != m_host.OwnerID)
return; return;
// harakiri check
if(sceneOG.UUID == m_host.ParentGroup.UUID)
throw new SelfDeleteException();
World.DeleteSceneObject(sceneOG, false); // restrict to objects rezzed by host
if(sceneOG.RezzerID == m_host.ParentGroup.UUID)
World.DeleteSceneObject(sceneOG, false);
} }
/// <summary> /// <summary>