aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorRevolution2010-01-08 12:37:10 -0600
committerMelanie2010-01-09 20:47:58 +0000
commit49c09ef24c37637c023d1ae22865d546efc4d0d0 (patch)
tree5a4ce4d43da143363dc02c90874addcddc2b8a3d /OpenSim/Region/Framework/Scenes
parentA last fix for estate access by group. One should send the correct list. (diff)
downloadopensim-SC_OLD-49c09ef24c37637c023d1ae22865d546efc4d0d0.zip
opensim-SC_OLD-49c09ef24c37637c023d1ae22865d546efc4d0d0.tar.gz
opensim-SC_OLD-49c09ef24c37637c023d1ae22865d546efc4d0d0.tar.bz2
opensim-SC_OLD-49c09ef24c37637c023d1ae22865d546efc4d0d0.tar.xz
Fixes prim to prim collision.
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index d1bc351..cadb19f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1941,7 +1941,7 @@ namespace OpenSim.Region.Framework.Scenes
1941 { 1941 {
1942 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1942 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1943 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 1943 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
1944 if (found) 1944 if (!found)
1945 { 1945 {
1946 DetectedObject detobj = new DetectedObject(); 1946 DetectedObject detobj = new DetectedObject();
1947 detobj.keyUUID = obj.UUID; 1947 detobj.keyUUID = obj.UUID;
@@ -2077,7 +2077,7 @@ namespace OpenSim.Region.Framework.Scenes
2077 { 2077 {
2078 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2078 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2079 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 2079 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
2080 if (found) 2080 if (!found)
2081 { 2081 {
2082 DetectedObject detobj = new DetectedObject(); 2082 DetectedObject detobj = new DetectedObject();
2083 detobj.keyUUID = obj.UUID; 2083 detobj.keyUUID = obj.UUID;
@@ -2208,7 +2208,7 @@ namespace OpenSim.Region.Framework.Scenes
2208 { 2208 {
2209 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2209 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2210 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 2210 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
2211 if (found) 2211 if (!found)
2212 { 2212 {
2213 DetectedObject detobj = new DetectedObject(); 2213 DetectedObject detobj = new DetectedObject();
2214 detobj.keyUUID = obj.UUID; 2214 detobj.keyUUID = obj.UUID;