aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-08 17:58:01 +0100
committerJustin Clark-Casey (justincc)2011-07-08 17:58:01 +0100
commit1dcad4ac6616a21216eeb139c901d98eed9169db (patch)
tree474a8163d29c157baa172480ac9456b235ed0624 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
parentSwitch the MeshUploadFlag CAP module on and off with the existing config Allo... (diff)
downloadopensim-SC-1dcad4ac6616a21216eeb139c901d98eed9169db.zip
opensim-SC-1dcad4ac6616a21216eeb139c901d98eed9169db.tar.gz
opensim-SC-1dcad4ac6616a21216eeb139c901d98eed9169db.tar.bz2
opensim-SC-1dcad4ac6616a21216eeb139c901d98eed9169db.tar.xz
minor: commented out log lines for future use and very small code tidy
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs10
1 files changed, 6 insertions, 4 deletions
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