1 files changed, 20 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 2b3d186..e58984b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -73,6 +73,8 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         public void Dispose()
         {
+            
+            d.CloseODE();
         }
     }
 
@@ -1509,5 +1511,23 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override void DeleteTerrain()
         {
         }
+        public override void Dispose()
+        {
+            lock (OdeLock)
+            {
+                
+                foreach (OdePrim prm in _prims)
+                {
+                    RemovePrim(prm);
+                }
+
+                foreach (OdeCharacter act in _characters)
+                {
+                    RemoveAvatar(act);
+                }
+                d.WorldDestroy(world);
+                //d.CloseODE();
+            }
+        }
     }
 }