aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs5
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs10
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
5 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f3879f0..cd5046a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1564,6 +1564,8 @@ namespace OpenSim.Region.Framework.Scenes
1564 /// <param name="m_physicalPrim"></param> 1564 /// <param name="m_physicalPrim"></param>
1565 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim) 1565 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim)
1566 { 1566 {
1567// m_log.DebugFormat("[SCENE OBJECT PART]: Applying physics to {0} {1} {2}", Name, LocalId, UUID);
1568
1567 bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim); 1569 bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim);
1568 bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0); 1570 bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0);
1569 1571
@@ -1584,6 +1586,8 @@ namespace OpenSim.Region.Framework.Scenes
1584 // or flexible 1586 // or flexible
1585 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible)) 1587 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible))
1586 { 1588 {
1589// m_log.DebugFormat("[SCENE OBJECT PART]: Creating PhysActor for {0} {1} {2}", Name, LocalId, UUID);
1590
1587 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 1591 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
1588 LocalId, 1592 LocalId,
1589 string.Format("{0}/{1}", Name, UUID), 1593 string.Format("{0}/{1}", Name, UUID),
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 54c50f8..13ea084 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -86,7 +86,10 @@ namespace OpenSim.Region.Physics.Manager
86 Vector3 size, Quaternion rotation, bool isPhysical) 86 Vector3 size, Quaternion rotation, bool isPhysical)
87 { 87 {
88 PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical); 88 PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical);
89 if (ret != null) ret.LocalID = localID; 89
90 if (ret != null)
91 ret.LocalID = localID;
92
90 return ret; 93 return ret;
91 } 94 }
92 95
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index a5fe45b..be4ee41 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -643,6 +643,8 @@ namespace OpenSim.Region.Physics.Meshing
643 643
644 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) 644 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
645 { 645 {
646// m_log.DebugFormat("[MESH]: Creating mesh for {0}", primName);
647
646 Mesh mesh = null; 648 Mesh mesh = null;
647 ulong key = 0; 649 ulong key = 0;
648 650
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index c91658e..1060278 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -791,6 +791,8 @@ namespace OpenSim.Region.Physics.OdePlugin
791 791
792 public void setMesh(OdeScene parent_scene, IMesh mesh) 792 public void setMesh(OdeScene parent_scene, IMesh mesh)
793 { 793 {
794// m_log.DebugFormat("[ODE PRIM]: Setting mesh on {0} to {1}", Name, mesh);
795
794 // This sleeper is there to moderate how long it takes between 796 // This sleeper is there to moderate how long it takes between
795 // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object 797 // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object
796 798
@@ -1398,7 +1400,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1398 } 1400 }
1399 } 1401 }
1400 } 1402 }
1401
1402 else 1403 else
1403 { 1404 {
1404 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1405 _parent_scene.waitForSpaceUnlock(m_targetSpace);
@@ -1960,7 +1961,7 @@ Console.WriteLine(" JointCreateFixed");
1960 mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); 1961 mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
1961 1962
1962 //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); 1963 //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
1963//Console.WriteLine("changesize 1"); 1964Console.WriteLine("changesize 1");
1964 CreateGeom(m_targetSpace, mesh); 1965 CreateGeom(m_targetSpace, mesh);
1965 1966
1966 1967
@@ -1968,7 +1969,7 @@ Console.WriteLine(" JointCreateFixed");
1968 else 1969 else
1969 { 1970 {
1970 _mesh = null; 1971 _mesh = null;
1971//Console.WriteLine("changesize 2"); 1972Console.WriteLine("changesize 2");
1972 CreateGeom(m_targetSpace, _mesh); 1973 CreateGeom(m_targetSpace, _mesh);
1973 } 1974 }
1974 1975
@@ -2070,12 +2071,13 @@ Console.WriteLine(" JointCreateFixed");
2070 2071
2071 IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); 2072 IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
2072 // createmesh returns null when it doesn't mesh. 2073 // createmesh returns null when it doesn't mesh.
2074Console.WriteLine("changeshape needed meshing");
2073 CreateGeom(m_targetSpace, mesh); 2075 CreateGeom(m_targetSpace, mesh);
2074 } 2076 }
2075 else 2077 else
2076 { 2078 {
2077 _mesh = null; 2079 _mesh = null;
2078//Console.WriteLine("changeshape"); 2080Console.WriteLine("changeshape not need meshing");
2079 CreateGeom(m_targetSpace, null); 2081 CreateGeom(m_targetSpace, null);
2080 } 2082 }
2081 2083
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 8d9f5f1..ae9c377 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1770,6 +1770,8 @@ namespace OpenSim.Region.Physics.OdePlugin
1770 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 1770 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1771 Vector3 size, Quaternion rotation, bool isPhysical) 1771 Vector3 size, Quaternion rotation, bool isPhysical)
1772 { 1772 {
1773// m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName);
1774
1773 PhysicsActor result; 1775 PhysicsActor result;
1774 IMesh mesh = null; 1776 IMesh mesh = null;
1775 1777