* Restaring the sim works fine in grid mode now. Sims announce themselves to their neighbors when they start up. Neighbors get this message and tell their agents that there's a new sim up.

* Certain unrecoverable physics based crashes in ODE are now hooked up to the 'restart the sim' routine.

1 files changed, 17 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 651992c..635b208 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -32,12 +32,29 @@ using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.Physics.Manager
 {
+    public delegate void physicsCrash();
+
     public abstract class PhysicsScene
     {
+        // The only thing that should register for this event is the InnerScene
+        // Anything else could cause problems.
+
+        public event physicsCrash OnPhysicsCrash;
+
         public static PhysicsScene Null
         {
             get { return new NullPhysicsScene(); }
         }
+        public virtual void TriggerPhysicsBasedRestart()
+        {
+            physicsCrash handler = OnPhysicsCrash;
+            if (handler != null)
+            {
+                OnPhysicsCrash();
+            }
+            
+        }
+        
 
         public abstract void Initialise(IMesher meshmerizer);