diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 749b281..f7c6413 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2509,21 +2509,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
2509 | { | 2509 | { |
2510 | } | 2510 | } |
2511 | 2511 | ||
2512 | private bool CollisionFilteredOut(SceneObjectPart dest, UUID objectID, string objectName) | 2512 | public bool CollisionFilteredOut(UUID objectID, string objectName) |
2513 | { | 2513 | { |
2514 | if(dest.CollisionFilter.Count == 0) | 2514 | if(CollisionFilter.Count == 0) |
2515 | return false; | 2515 | return false; |
2516 | 2516 | ||
2517 | if (dest.CollisionFilter.ContainsValue(objectID.ToString()) || | 2517 | if (CollisionFilter.ContainsValue(objectID.ToString()) || |
2518 | dest.CollisionFilter.ContainsValue(objectID.ToString() + objectName) || | 2518 | CollisionFilter.ContainsValue(objectID.ToString() + objectName) || |
2519 | dest.CollisionFilter.ContainsValue(UUID.Zero.ToString() + objectName)) | 2519 | CollisionFilter.ContainsValue(UUID.Zero.ToString() + objectName)) |
2520 | { | 2520 | { |
2521 | if (dest.CollisionFilter.ContainsKey(1)) | 2521 | if (CollisionFilter.ContainsKey(1)) |
2522 | return false; | 2522 | return false; |
2523 | return true; | 2523 | return true; |
2524 | } | 2524 | } |
2525 | 2525 | ||
2526 | if (dest.CollisionFilter.ContainsKey(1)) | 2526 | if (CollisionFilter.ContainsKey(1)) |
2527 | return true; | 2527 | return true; |
2528 | 2528 | ||
2529 | return false; | 2529 | return false; |
@@ -2586,7 +2586,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2586 | SceneObjectPart obj = ParentGroup.Scene.GetSceneObjectPart(localId); | 2586 | SceneObjectPart obj = ParentGroup.Scene.GetSceneObjectPart(localId); |
2587 | if (obj != null) | 2587 | if (obj != null) |
2588 | { | 2588 | { |
2589 | if (!dest.CollisionFilteredOut(this, obj.UUID, obj.Name)) | 2589 | if (!dest.CollisionFilteredOut(obj.UUID, obj.Name)) |
2590 | colliding.Add(CreateDetObject(obj)); | 2590 | colliding.Add(CreateDetObject(obj)); |
2591 | } | 2591 | } |
2592 | else | 2592 | else |
@@ -2594,7 +2594,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2594 | ScenePresence av = ParentGroup.Scene.GetScenePresence(localId); | 2594 | ScenePresence av = ParentGroup.Scene.GetScenePresence(localId); |
2595 | if (av != null && (!av.IsChildAgent)) | 2595 | if (av != null && (!av.IsChildAgent)) |
2596 | { | 2596 | { |
2597 | if (!dest.CollisionFilteredOut(this, av.UUID, av.Name)) | 2597 | if (!dest.CollisionFilteredOut(av.UUID, av.Name)) |
2598 | colliding.Add(CreateDetObject(av)); | 2598 | colliding.Add(CreateDetObject(av)); |
2599 | } | 2599 | } |
2600 | } | 2600 | } |