diff options
author | UbitUmarov | 2014-09-23 23:59:05 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-23 23:59:05 +0100 |
commit | 6d2cdd31fe2bc330485cc519133e6d38562255ba (patch) | |
tree | ef49ab96b7074cb7a7ac6874fc71f0ed46297ee3 /OpenSim/Region | |
parent | Merge branch 'master' into ubitworkmaster (diff) | |
download | opensim-SC-6d2cdd31fe2bc330485cc519133e6d38562255ba.zip opensim-SC-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.gz opensim-SC-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.bz2 opensim-SC-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.xz |
populate collision lists with LinkNumber, and detected structure in
Xengine
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index de07131..6daa109 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2707,6 +2707,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2707 | detobj.velVector = obj.Velocity; | 2707 | detobj.velVector = obj.Velocity; |
2708 | detobj.colliderType = 0; | 2708 | detobj.colliderType = 0; |
2709 | detobj.groupUUID = obj.GroupID; | 2709 | detobj.groupUUID = obj.GroupID; |
2710 | detobj.linkNumber = LinkNum; // pass my link number | ||
2710 | 2711 | ||
2711 | return detobj; | 2712 | return detobj; |
2712 | } | 2713 | } |
@@ -2722,6 +2723,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2722 | detobj.velVector = av.Velocity; | 2723 | detobj.velVector = av.Velocity; |
2723 | detobj.colliderType = 0; | 2724 | detobj.colliderType = 0; |
2724 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; | 2725 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; |
2726 | detobj.linkNumber = LinkNum; // pass my link number | ||
2725 | 2727 | ||
2726 | return detobj; | 2728 | return detobj; |
2727 | } | 2729 | } |
@@ -2737,6 +2739,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2737 | detobj.velVector = Vector3.Zero; | 2739 | detobj.velVector = Vector3.Zero; |
2738 | detobj.colliderType = 0; | 2740 | detobj.colliderType = 0; |
2739 | detobj.groupUUID = UUID.Zero; | 2741 | detobj.groupUUID = UUID.Zero; |
2742 | detobj.linkNumber = LinkNum; // pass my link number not sure needed.. but no harm | ||
2740 | 2743 | ||
2741 | return detobj; | 2744 | return detobj; |
2742 | } | 2745 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9c55d4a..b19d20d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -5586,6 +5586,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5586 | detobj.velVector = obj.Velocity; | 5586 | detobj.velVector = obj.Velocity; |
5587 | detobj.colliderType = 0; | 5587 | detobj.colliderType = 0; |
5588 | detobj.groupUUID = obj.GroupID; | 5588 | detobj.groupUUID = obj.GroupID; |
5589 | detobj.linkNumber = 0; | ||
5589 | 5590 | ||
5590 | return detobj; | 5591 | return detobj; |
5591 | } | 5592 | } |
@@ -5601,6 +5602,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5601 | detobj.velVector = av.Velocity; | 5602 | detobj.velVector = av.Velocity; |
5602 | detobj.colliderType = 0; | 5603 | detobj.colliderType = 0; |
5603 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; | 5604 | detobj.groupUUID = av.ControllingClient.ActiveGroupId; |
5605 | detobj.linkNumber = 0; | ||
5604 | 5606 | ||
5605 | return detobj; | 5607 | return detobj; |
5606 | } | 5608 | } |
@@ -5616,7 +5618,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5616 | detobj.velVector = Vector3.Zero; | 5618 | detobj.velVector = Vector3.Zero; |
5617 | detobj.colliderType = 0; | 5619 | detobj.colliderType = 0; |
5618 | detobj.groupUUID = UUID.Zero; | 5620 | detobj.groupUUID = UUID.Zero; |
5619 | 5621 | detobj.linkNumber = 0; | |
5620 | return detobj; | 5622 | return detobj; |
5621 | } | 5623 | } |
5622 | 5624 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 0ff2da3..ad775ff 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -245,6 +245,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
245 | DetectParams d = new DetectParams(); | 245 | DetectParams d = new DetectParams(); |
246 | d.Key =detobj.keyUUID; | 246 | d.Key =detobj.keyUUID; |
247 | d.Populate(myScriptEngine.World); | 247 | d.Populate(myScriptEngine.World); |
248 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
248 | det.Add(d); | 249 | det.Add(d); |
249 | } | 250 | } |
250 | 251 | ||
@@ -265,6 +266,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
265 | DetectParams d = new DetectParams(); | 266 | DetectParams d = new DetectParams(); |
266 | d.Key =detobj.keyUUID; | 267 | d.Key =detobj.keyUUID; |
267 | d.Populate(myScriptEngine.World); | 268 | d.Populate(myScriptEngine.World); |
269 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
268 | det.Add(d); | 270 | det.Add(d); |
269 | } | 271 | } |
270 | 272 | ||
@@ -284,6 +286,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
284 | DetectParams d = new DetectParams(); | 286 | DetectParams d = new DetectParams(); |
285 | d.Key =detobj.keyUUID; | 287 | d.Key =detobj.keyUUID; |
286 | d.Populate(myScriptEngine.World); | 288 | d.Populate(myScriptEngine.World); |
289 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
287 | det.Add(d); | 290 | det.Add(d); |
288 | } | 291 | } |
289 | 292 | ||