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

mantis 6702: fix collisions lldetectedlinknumber also on Yengine

0.9.1.0-post-fixes
UbitUmarov 2019-01-30 12:27:03 +00:00
parent dd43e613f0
commit 73e64c6597
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2670,6 +2670,9 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = obj.Velocity; detobj.velVector = obj.Velocity;
detobj.colliderType = 0; detobj.colliderType = 0;
detobj.groupUUID = obj.GroupID; detobj.groupUUID = obj.GroupID;
if (VolumeDetectActive)
detobj.linkNumber = 0;
else
detobj.linkNumber = LinkNum; detobj.linkNumber = LinkNum;
return detobj; return detobj;
} }
@ -2689,6 +2692,9 @@ namespace OpenSim.Region.Framework.Scenes
else if(detobj.velVector != Vector3.Zero) else if(detobj.velVector != Vector3.Zero)
detobj.colliderType |= 0x2; //active detobj.colliderType |= 0x2; //active
detobj.groupUUID = av.ControllingClient.ActiveGroupId; detobj.groupUUID = av.ControllingClient.ActiveGroupId;
if (VolumeDetectActive)
detobj.linkNumber = 0;
else
detobj.linkNumber = LinkNum; detobj.linkNumber = LinkNum;
return detobj; return detobj;
@ -2705,8 +2711,7 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = Vector3.Zero; detobj.velVector = Vector3.Zero;
detobj.colliderType = 0; detobj.colliderType = 0;
detobj.groupUUID = UUID.Zero; detobj.groupUUID = UUID.Zero;
detobj.linkNumber = LinkNum; // pass my link number not sure needed.. but no harm detobj.linkNumber = LinkNum;
return detobj; return detobj;
} }

1
OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
View File

@ -245,7 +245,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
DetectParams d = new DetectParams(); DetectParams d = new DetectParams();
d.Key =detobj.keyUUID; d.Key =detobj.keyUUID;
d.Populate(myScriptEngine.World, detobj); d.Populate(myScriptEngine.World, detobj);
d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part
det.Add(d); det.Add(d);
} }

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

@ -231,13 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
det[i++] = d; det[i++] = d;
d.Key = detobj.keyUUID; d.Key = detobj.keyUUID;
d.Populate(this.World); d.Populate(World, detobj);
/* not done by XEngine...
d.Position = detobj.posVector;
d.Rotation = detobj.rotQuat;
d.Velocity = detobj.velVector;
... */
} }
this.PostObjectEvent(localID, new EventParams( this.PostObjectEvent(localID, new EventParams(