aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c25c3b4..bee96d1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2248,6 +2248,7 @@ namespace OpenSim.Region.Framework.Scenes
2248 }); 2248 });
2249 } 2249 }
2250 } 2250 }
2251
2251 if (colliding.Count > 0) 2252 if (colliding.Count > 0)
2252 { 2253 {
2253 StartCollidingMessage.Colliders = colliding; 2254 StartCollidingMessage.Colliders = colliding;
@@ -2255,10 +2256,11 @@ namespace OpenSim.Region.Framework.Scenes
2255 if (m_parentGroup.Scene == null) 2256 if (m_parentGroup.Scene == null)
2256 return; 2257 return;
2257 2258
2258 if (m_parentGroup.PassCollision == true) 2259// if (m_parentGroup.PassCollision == true)
2259 { 2260// {
2260 //TODO: Add pass to root prim! 2261// //TODO: Add pass to root prim!
2261 } 2262// }
2263
2262 m_parentGroup.Scene.EventManager.TriggerScriptCollidingStart(LocalId, StartCollidingMessage); 2264 m_parentGroup.Scene.EventManager.TriggerScriptCollidingStart(LocalId, StartCollidingMessage);
2263 } 2265 }
2264 } 2266 }