* Made it safe again to use the restart button from the estate tools and the restart console command.

* It looks ugly on the console..   but it's really safe..  and restores some memory.

2 files changed, 11 insertions, 4 deletions

diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 59083c7..3d1512f 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -208,10 +208,14 @@ namespace OpenSim.Region.ClientStack
                     // Stupid I know..  
                     // but Flusing the buffer would be even more stupid...  so, we're stuck with this ugly method.
                 }
+
                 catch (SocketException e2)
                 {
                     m_log.Error("[UDPSERVER]: " + e2.ToString());
                 }
+                catch (ObjectDisposedException)
+                {
+                }
                 //return;
             }
 
@@ -264,6 +268,9 @@ namespace OpenSim.Region.ClientStack
                     m_log.Error("[UDPSERVER]: " + e5.ToString());
                 }
             }
+            catch (ObjectDisposedException)
+            {
+            }
 
             if (packet != null)
             {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index fa128de..a2f440e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2064,10 +2064,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                     RemovePrim(prm);
                 }
 
-                foreach (OdeCharacter act in _characters)
-                {
-                    RemoveAvatar(act);
-                }
+                //foreach (OdeCharacter act in _characters)
+                //{
+                    //RemoveAvatar(act);
+                //}
                 d.WorldDestroy(world);
                 //d.CloseODE();
             }