diff options
| author | Melanie | 2010-01-09 20:54:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-09 20:54:59 +0000 |
| commit | 46b5fe5acdbf82073964dcaf50fc4c6994779633 (patch) | |
| tree | 6b16d3910e53ba877300632d4021840829b89566 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fixes prim to prim collision. (diff) | |
| download | opensim-SC-46b5fe5acdbf82073964dcaf50fc4c6994779633.zip opensim-SC-46b5fe5acdbf82073964dcaf50fc4c6994779633.tar.gz opensim-SC-46b5fe5acdbf82073964dcaf50fc4c6994779633.tar.bz2 opensim-SC-46b5fe5acdbf82073964dcaf50fc4c6994779633.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index e5fc027..ff4abf9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1950,7 +1950,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1950 | { | 1950 | { |
| 1951 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 1951 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
| 1952 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work | 1952 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work |
| 1953 | if (found) | 1953 | if (!found) |
| 1954 | { | 1954 | { |
| 1955 | DetectedObject detobj = new DetectedObject(); | 1955 | DetectedObject detobj = new DetectedObject(); |
| 1956 | detobj.keyUUID = obj.UUID; | 1956 | detobj.keyUUID = obj.UUID; |
| @@ -2086,7 +2086,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2086 | { | 2086 | { |
| 2087 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 2087 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
| 2088 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work | 2088 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work |
| 2089 | if (found) | 2089 | if (!found) |
| 2090 | { | 2090 | { |
| 2091 | DetectedObject detobj = new DetectedObject(); | 2091 | DetectedObject detobj = new DetectedObject(); |
| 2092 | detobj.keyUUID = obj.UUID; | 2092 | detobj.keyUUID = obj.UUID; |
| @@ -2217,7 +2217,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2217 | { | 2217 | { |
| 2218 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); | 2218 | bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); |
| 2219 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work | 2219 | //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work |
| 2220 | if (found) | 2220 | if (!found) |
| 2221 | { | 2221 | { |
| 2222 | DetectedObject detobj = new DetectedObject(); | 2222 | DetectedObject detobj = new DetectedObject(); |
| 2223 | detobj.keyUUID = obj.UUID; | 2223 | detobj.keyUUID = obj.UUID; |