ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 09:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Implements llScriptDanger

Browse Source 
* Made the scene's scriptDanger method more generic so both the llScriptDanger method and the Script engine method use the same private method.
This commit is contained in:
Teravus Ovares
2008-04-22 10:11:29 +00:00
parent 809447ac32
commit 61f23fa045
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -2771,13 +2771,11 @@ namespace OpenSim.Region.Environment.Scenes
m_eventManager.TriggerOnScriptChangedEvent(localID, change);
}
public bool pipeEventsForScript(uint localID)
private bool scriptDanger(SceneObjectPart part,LLVector3 pos)
{
SceneObjectPart part = GetSceneObjectPart(localID);
ILandObject parcel = LandChannel.getLandObject(pos.X, pos.Y);
if (part != null)
{
LLVector3 pos = part.GetWorldPosition();
ILandObject parcel = LandChannel.getLandObject(pos.X, pos.Y);
if (parcel != null)
{
if ((parcel.landData.landFlags & (uint)Parcel.ParcelFlags.AllowOtherScripts) != 0)
@@ -2809,7 +2807,7 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
if (pos.X > 0f && pos.X < Constants.RegionSize && pos.Y > 0f && pos.Y < Constants.RegionSize)
{
// The only time parcel != null when an object is inside a region is when
@@ -2822,6 +2820,33 @@ namespace OpenSim.Region.Environment.Scenes
return false;
}
}
}
else
{
return false;
}
}
public bool scriptDanger(uint localID, LLVector3 pos)
{
SceneObjectPart part = GetSceneObjectPart(localID);
if (part != null)
{
return scriptDanger(part, pos);
}
else
{
return false;
}
}
public bool pipeEventsForScript(uint localID)
{
SceneObjectPart part = GetSceneObjectPart(localID);
if (part != null)
{
LLVector3 pos = part.GetWorldPosition();
return scriptDanger(part, pos);
}
else