1 files changed, 5 insertions, 17 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 5fa4637..6f346d3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -343,14 +343,12 @@ namespace OpenMetaverse
             {
                 // kick off an async read
                 m_udpSocket.BeginReceiveFrom(
-                    //wrappedBuffer.Instance.Data,
                     buf.Data,
                     0,
-                    UDPPacketBuffer.BUFFER_SIZE,
+                    buf.Data.Length,
                     SocketFlags.None,
                     ref buf.RemoteEndPoint,
                     AsyncEndReceive,
-                    //wrappedBuffer);
                     buf);
             }
             catch (SocketException e)
@@ -364,14 +362,12 @@ namespace OpenMetaverse
                         try
                         {
                             m_udpSocket.BeginReceiveFrom(
-                                //wrappedBuffer.Instance.Data,
                                 buf.Data,
                                 0,
-                                UDPPacketBuffer.BUFFER_SIZE,
+                                buf.Data.Length,
                                 SocketFlags.None,
                                 ref buf.RemoteEndPoint,
                                 AsyncEndReceive,
-                                //wrappedBuffer);
                                 buf);
                             salvaged = true;
                         }
@@ -382,11 +378,6 @@ namespace OpenMetaverse
                     m_log.Warn("[UDPBASE]: Salvaged the UDP listener on port " + m_udpPort);
                 }
             }
-            catch (ObjectDisposedException e)
-            {
-                m_log.Error(
-                    string.Format("[UDPBASE]: Error processing UDP begin receive {0}.  Exception  ", UdpReceives), e);
-            }
             catch (Exception e)
             {
                 m_log.Error(
@@ -443,11 +434,6 @@ namespace OpenMetaverse
                             UdpReceives, se.ErrorCode),
                         se);
                 }
-                catch (ObjectDisposedException e)
-                {
-                    m_log.Error(
-                        string.Format("[UDPBASE]: Error processing UDP end receive {0}.  Exception  ", UdpReceives), e);
-                }
                 catch (Exception e)
                 {
                     m_log.Error(
@@ -502,6 +488,8 @@ namespace OpenMetaverse
 */
         public void SyncSend(UDPPacketBuffer buf)
         {
+            if(buf.RemoteEndPoint == null)
+                return; // was already expired
             try
             {
                 m_udpSocket.SendTo(
@@ -515,7 +503,7 @@ namespace OpenMetaverse
             }
             catch (SocketException e)
             {
-                m_log.Warn("[UDPBASE]: sync send SocketException {0} " + e.Message);
+                m_log.WarnFormat("[UDPBASE]: sync send SocketException {0} {1}", buf.RemoteEndPoint, e.Message);
             }
             catch (ObjectDisposedException) { }
         }