aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs33
1 files changed, 11 insertions, 22 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ec97d25..6a742c1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2131,19 +2131,20 @@ namespace OpenSim.Region.Framework.Scenes
2131 group.RemoveScriptInstances(true); 2131 group.RemoveScriptInstances(true);
2132 } 2132 }
2133 2133
2134 List<SceneObjectPart> partList = null;
2134 lock (group.Children) 2135 lock (group.Children)
2136 partList = new List<SceneObjectPart>(group.Children.Values);
2137
2138 foreach (SceneObjectPart part in partList)
2135 { 2139 {
2136 foreach (SceneObjectPart part in group.Children.Values) 2140 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0))
2137 { 2141 {
2138 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0)) 2142 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed?
2139 { 2143 }
2140 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? 2144 else if (part.PhysActor != null)
2141 } 2145 {
2142 else if (part.PhysActor != null) 2146 PhysicsScene.RemovePrim(part.PhysActor);
2143 { 2147 part.PhysActor = null;
2144 PhysicsScene.RemovePrim(part.PhysActor);
2145 part.PhysActor = null;
2146 }
2147 } 2148 }
2148 } 2149 }
2149 2150
@@ -3720,18 +3721,6 @@ namespace OpenSim.Region.Framework.Scenes
3720 return true; 3721 return true;
3721 } 3722 }
3722 3723
3723 private ILandObject GetParcelAtPoint(float x, float y)
3724 {
3725 foreach (var parcel in AllParcels())
3726 {
3727 if (parcel.ContainsPoint((int)x,(int)y))
3728 {
3729 return parcel;
3730 }
3731 }
3732 return null;
3733 }
3734
3735 /// <summary> 3724 /// <summary>
3736 /// Update an AgentCircuitData object with new information 3725 /// Update an AgentCircuitData object with new information
3737 /// </summary> 3726 /// </summary>