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/Framework/Scenes/ScenePresence.cs | |
parent | Merge branch 'master' into ubitworkmaster (diff) | |
download | opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.zip opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.gz opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.bz2 opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.xz |
populate collision lists with LinkNumber, and detected structure in
Xengine
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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 | ||