* The equals override of 'Location' is not working as expected. This caused sim restarts to fail because the test that searches for and shutsdown the UDP server listener for that region never found and shutdown the udp server. hence the error message, "only one listener on port".

* This is a high profile candidate for a unit test. (big)

1 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 01f2a09..8653b23 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -106,7 +106,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public bool HandlesRegion(Location x)
         {
-            return x == m_location;
+            return x.RegionHandle == m_location.RegionHandle;
+            //return x == m_location;
         }
 
         public void AddScene(Scene x)
@@ -306,6 +307,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // the next set of UDP data is for a valid client.         
                 ResetServerEndPoint(e);
             }
+            catch (System.ObjectDisposedException)
+            {
+                m_log.Info("[UDPSERVER]: UDP Object disposed.   No need to worry about this if you're restarting the simulator.");
+            }
+            
         }       
 
         /// <summary>