2 files changed, 19 insertions, 7 deletions

diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index 2e22f00..1364d3e 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -188,9 +188,9 @@ namespace OpenSim.Framework.Data.SQLite
                     }
                     else if (prim.Stopped)
                     {
-                        //MainLog.Instance.Verbose("DATASTORE",
-                                                 //"Adding stopped obj: " + obj.UUID + " to region: " + regionUUID);
-                        //addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
+                        MainLog.Instance.Verbose("DATASTORE",
+                                                 "Adding stopped obj: " + obj.UUID + " to region: " + regionUUID);
+                        addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
                     }
                     else
                     {
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 4e4a0aa..59eec0c 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -112,6 +112,7 @@ namespace OpenSim.Region.ClientStack
             {
                 // TODO : Actually only handle those states that we have control over, re-throw everything else,
                 // TODO: implement cases as we encounter them.
+                m_log.Error("UDPSERVER", "Connection Error! - " + e.ToString());
                 switch (e.SocketErrorCode)
                 {
                     case SocketError.AlreadyInProgress:
@@ -179,8 +180,9 @@ namespace OpenSim.Region.ClientStack
 
                 return;
             }
-            catch (ObjectDisposedException)
+            catch (ObjectDisposedException e)
             {
+                m_log.Warn("UDPSERVER", "Connection Error! - " + e.ToString());
                 //MainLog.Instance.Debug("UDPSERVER", e.ToString());
                 return;
             }
@@ -191,9 +193,18 @@ namespace OpenSim.Region.ClientStack
             {
                 packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                //MainLog.Instance.Debug("UDPSERVER", e.ToString());
+                MainLog.Instance.Warn("UDPSERVER","Packet Error! - " + e.ToString());
+                try
+                {
+                    packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+                    MainLog.Instance.Warn("UDPSERVER", "Recovered from Packet Error - " + e.ToString());
+                }
+                catch (Exception e2)
+                {
+                    MainLog.Instance.Warn("UDPSERVER", "2nd Packet Error! - " + e.ToString());
+                }
             }
 
             if (packet != null)
@@ -216,7 +227,8 @@ namespace OpenSim.Region.ClientStack
                 {
                     // invalid client
                     //CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now
-                    //m_log.Warn("client", "Got a packet from an invalid client - " + epSender.ToString());
+                    m_log.Warn("UDPSERVER", "Got a packet from an invalid client - " + packet.ToString());
+
                 }
             }