** DANGER someone should stress test more ** release unused physics meshs, including unmanaged memory allocations (allocated by managed code)

1 files changed, 15 insertions, 4 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index f3ac3ca..3ee5198 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -194,7 +194,8 @@ namespace OpenSim.Region.Physics.OdePlugin
         private float metersInSpace = 25.6f;
         private float m_timeDilation = 1.0f;
 
-        DateTime m_lastframe;
+        private DateTime m_lastframe;
+        private DateTime m_lastMeshExpire;
 
         public float gravityx = 0f;
         public float gravityy = 0f;
@@ -203,6 +204,8 @@ namespace OpenSim.Region.Physics.OdePlugin
         private float waterlevel = 0f;
         private int framecount = 0;
 
+        private int m_meshExpireCntr;
+
 //        private IntPtr WaterGeom = IntPtr.Zero;
 //        private IntPtr WaterHeightmapData = IntPtr.Zero;
 //        private GCHandle WaterMapHandler = new GCHandle();
@@ -263,7 +266,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         const int maxContactsbeforedeath = 4000;
         private volatile int m_global_contactcount = 0;
 
-
         private IntPtr contactgroup;
 
         public ContactData[] m_materialContactsData = new ContactData[8];
@@ -594,6 +596,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
 
             m_lastframe = DateTime.UtcNow;
+            m_lastMeshExpire = m_lastframe;
         }
 
         internal void waitForSpaceUnlock(IntPtr space)
@@ -1768,9 +1771,9 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
 
             DateTime now = DateTime.UtcNow;
-            TimeSpan SinceLastFrame = now - m_lastframe;
+            TimeSpan timedif = now - m_lastframe;
             m_lastframe = now;
-            timeStep = (float)SinceLastFrame.TotalSeconds;
+            timeStep = (float)timedif.TotalSeconds;
             
             // acumulate time so we can reduce error
             step_time += timeStep;
@@ -1972,6 +1975,14 @@ namespace OpenSim.Region.Physics.OdePlugin
                         _badCharacter.Clear();
                     }
                 }
+
+                timedif = now - m_lastMeshExpire;
+
+                if (timedif.Seconds > 10)
+                {
+                    mesher.ExpireReleaseMeshs();
+                    m_lastMeshExpire = now;
+                }
 /*
                 int nactivegeoms = d.SpaceGetNumGeoms(ActiveSpace);
                 int nstaticgeoms = d.SpaceGetNumGeoms(StaticSpace);