ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 19:35:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

change script touchs linknumber handling

Browse Source
This commit is contained in:
UbitUmarov
2021-04-21 13:48:25 +01:00
parent 277c4f1433
commit 4198dcdf86
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs
View File

@@ -150,25 +150,31 @@ namespace OpenSim.Region.ScriptEngine.Yengine
private void touches(uint localID, uint originalID, Vector3 offsetPos,
IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs, string eventname)
{
SceneObjectPart part;
if(originalID == 0)
if (m_Exiting)
return;
SceneObjectPart part = World.GetSceneObjectPart(localID);
if(part == null || part.IsDeleted)
return;
int linknum;
if(originalID != 0 && originalID != localID)
{
part = this.World.GetSceneObjectPart(localID);
if(part == null)
SceneObjectPart srcpart = World.GetSceneObjectPart(originalID);
if(srcpart == null || part.IsDeleted)
return;
linknum = srcpart.LinkNum;
}
else
{
part = this.World.GetSceneObjectPart(originalID);
}
linknum = part.LinkNum;
DetectParams det = new DetectParams();
det.Key = remoteClient.AgentId;
det.Populate(this.World);
det.Populate(World);
det.OffsetPos = new LSL_Vector(offsetPos.X,
offsetPos.Y,
offsetPos.Z);
det.LinkNum = part.LinkNum;
det.LinkNum = linknum;
if(surfaceArgs != null)
{
@@ -176,7 +182,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
}
// Add to queue for all scripts in ObjectID object
this.PostObjectEvent(localID, new EventParams(
PostPrimEvent(part, new EventParams(
eventname, oneObjectArrayOne,
new DetectParams[] { det }));
}