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

populate collision lists with LinkNumber, and detected structure in 

Xengine
avinationmerge
UbitUmarov 2014-09-23 23:59:05 +01:00
parent ac09dd9946
commit 6d2cdd31fe
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2707,6 +2707,7 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = obj.Velocity;
detobj.colliderType = 0;
detobj.groupUUID = obj.GroupID;
detobj.linkNumber = LinkNum; // pass my link number
return detobj;
}
@ -2722,6 +2723,7 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = av.Velocity;
detobj.colliderType = 0;
detobj.groupUUID = av.ControllingClient.ActiveGroupId;
detobj.linkNumber = LinkNum; // pass my link number
return detobj;
}
@ -2737,6 +2739,7 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = Vector3.Zero;
detobj.colliderType = 0;
detobj.groupUUID = UUID.Zero;
detobj.linkNumber = LinkNum; // pass my link number not sure needed.. but no harm
return detobj;
}

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -5586,6 +5586,7 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = obj.Velocity;
detobj.colliderType = 0;
detobj.groupUUID = obj.GroupID;
detobj.linkNumber = 0;
return detobj;
}
@ -5601,6 +5602,7 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = av.Velocity;
detobj.colliderType = 0;
detobj.groupUUID = av.ControllingClient.ActiveGroupId;
detobj.linkNumber = 0;
return detobj;
}
@ -5616,7 +5618,7 @@ namespace OpenSim.Region.Framework.Scenes
detobj.velVector = Vector3.Zero;
detobj.colliderType = 0;
detobj.groupUUID = UUID.Zero;
detobj.linkNumber = 0;
return detobj;
}

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

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