aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs6
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs20
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
188 } 188 }
189 else if (prim.Stopped) 189 else if (prim.Stopped)
190 { 190 {
191 //MainLog.Instance.Verbose("DATASTORE", 191 MainLog.Instance.Verbose("DATASTORE",
192 //"Adding stopped obj: " + obj.UUID + " to region: " + regionUUID); 192 "Adding stopped obj: " + obj.UUID + " to region: " + regionUUID);
193 //addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); 193 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
194 } 194 }
195 else 195 else
196 { 196 {
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
112 { 112 {
113 // TODO : Actually only handle those states that we have control over, re-throw everything else, 113 // TODO : Actually only handle those states that we have control over, re-throw everything else,
114 // TODO: implement cases as we encounter them. 114 // TODO: implement cases as we encounter them.
115 m_log.Error("UDPSERVER", "Connection Error! - " + e.ToString());
115 switch (e.SocketErrorCode) 116 switch (e.SocketErrorCode)
116 { 117 {
117 case SocketError.AlreadyInProgress: 118 case SocketError.AlreadyInProgress:
@@ -179,8 +180,9 @@ namespace OpenSim.Region.ClientStack
179 180
180 return; 181 return;
181 } 182 }
182 catch (ObjectDisposedException) 183 catch (ObjectDisposedException e)
183 { 184 {
185 m_log.Warn("UDPSERVER", "Connection Error! - " + e.ToString());
184 //MainLog.Instance.Debug("UDPSERVER", e.ToString()); 186 //MainLog.Instance.Debug("UDPSERVER", e.ToString());
185 return; 187 return;
186 } 188 }
@@ -191,9 +193,18 @@ namespace OpenSim.Region.ClientStack
191 { 193 {
192 packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); 194 packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
193 } 195 }
194 catch (Exception) 196 catch (Exception e)
195 { 197 {
196 //MainLog.Instance.Debug("UDPSERVER", e.ToString()); 198 MainLog.Instance.Warn("UDPSERVER","Packet Error! - " + e.ToString());
199 try
200 {
201 packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
202 MainLog.Instance.Warn("UDPSERVER", "Recovered from Packet Error - " + e.ToString());
203 }
204 catch (Exception e2)
205 {
206 MainLog.Instance.Warn("UDPSERVER", "2nd Packet Error! - " + e.ToString());
207 }
197 } 208 }
198 209
199 if (packet != null) 210 if (packet != null)
@@ -216,7 +227,8 @@ namespace OpenSim.Region.ClientStack
216 { 227 {
217 // invalid client 228 // invalid client
218 //CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now 229 //CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now
219 //m_log.Warn("client", "Got a packet from an invalid client - " + epSender.ToString()); 230 m_log.Warn("UDPSERVER", "Got a packet from an invalid client - " + packet.ToString());
231
220 } 232 }
221 } 233 }
222 234