diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index e68632b..843ae3d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
173 | //lock (m_parentGroup.m_scene.SyncRoot) | 173 | //lock (m_parentGroup.m_scene.SyncRoot) |
174 | //{ | 174 | //{ |
175 | PhysActor.Position = new PhysicsVector(value.X, value.Y, value.Z); | 175 | PhysActor.Position = new PhysicsVector(value.X, value.Y, value.Z); |
176 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 176 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
177 | //} | 177 | //} |
178 | } | 178 | } |
179 | catch (Exception e) | 179 | catch (Exception e) |
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
226 | //lock (m_scene.SyncRoot) | 226 | //lock (m_scene.SyncRoot) |
227 | //{ | 227 | //{ |
228 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); | 228 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); |
229 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 229 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
230 | //} | 230 | //} |
231 | } | 231 | } |
232 | catch (Exception ex) | 232 | catch (Exception ex) |
@@ -961,7 +961,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
961 | AddFlag(LLObject.ObjectFlags.Phantom); | 961 | AddFlag(LLObject.ObjectFlags.Phantom); |
962 | if (PhysActor != null) | 962 | if (PhysActor != null) |
963 | { | 963 | { |
964 | m_parentGroup.m_scene.PhysScene.RemovePrim(PhysActor); | 964 | m_parentGroup.m_scene.PhysicsScene.RemovePrim(PhysActor); |
965 | /// that's not wholesome. Had to make m_scene public | 965 | /// that's not wholesome. Had to make m_scene public |
966 | PhysActor = null; | 966 | PhysActor = null; |
967 | } | 967 | } |
@@ -971,7 +971,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
971 | RemFlag(LLObject.ObjectFlags.Phantom); | 971 | RemFlag(LLObject.ObjectFlags.Phantom); |
972 | if (PhysActor == null) | 972 | if (PhysActor == null) |
973 | { | 973 | { |
974 | PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( | 974 | PhysActor = m_parentGroup.m_scene.PhysicsScene.AddPrimShape( |
975 | Name, | 975 | Name, |
976 | Shape, | 976 | Shape, |
977 | new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, | 977 | new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, |
@@ -1015,14 +1015,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1015 | 1015 | ||
1016 | PhysActor.IsPhysical = UsePhysics; | 1016 | PhysActor.IsPhysical = UsePhysics; |
1017 | // If we're not what we're supposed to be in the physics scene, recreate ourselves. | 1017 | // If we're not what we're supposed to be in the physics scene, recreate ourselves. |
1018 | //m_parentGroup.m_scene.PhysScene.RemovePrim(PhysActor); | 1018 | //m_parentGroup.m_scene.PhysicsScene.RemovePrim(PhysActor); |
1019 | /// that's not wholesome. Had to make m_scene public | 1019 | /// that's not wholesome. Had to make m_scene public |
1020 | //PhysActor = null; | 1020 | //PhysActor = null; |
1021 | 1021 | ||
1022 | 1022 | ||
1023 | if ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) | 1023 | if ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) |
1024 | { | 1024 | { |
1025 | //PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( | 1025 | //PhysActor = m_parentGroup.m_scene.PhysicsScene.AddPrimShape( |
1026 | //Name, | 1026 | //Name, |
1027 | //Shape, | 1027 | //Shape, |
1028 | //new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, | 1028 | //new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, |
@@ -1037,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1037 | } | 1037 | } |
1038 | } | 1038 | } |
1039 | } | 1039 | } |
1040 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 1040 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
1041 | } | 1041 | } |
1042 | } | 1042 | } |
1043 | 1043 | ||
@@ -1293,7 +1293,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1293 | OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds."); | 1293 | OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds."); |
1294 | RemFlag(LLObject.ObjectFlags.Physics); | 1294 | RemFlag(LLObject.ObjectFlags.Physics); |
1295 | doPhysicsPropertyUpdate(false,true); | 1295 | doPhysicsPropertyUpdate(false,true); |
1296 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 1296 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
1297 | 1297 | ||
1298 | 1298 | ||
1299 | } | 1299 | } |