OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Stopped Physical Object saving on SQLite got commented out in my last commit.. un commenting it out now.

ThreadPoolClientBranch
Teravus Ovares 2008-01-21 03:13:44 +00:00
parent a3851b3812
commit da99c2ab10
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
View File

@ -188,9 +188,9 @@ namespace OpenSim.Framework.Data.SQLite
} }
else if (prim.Stopped) else if (prim.Stopped)
{ {
//MainLog.Instance.Verbose("DATASTORE", MainLog.Instance.Verbose("DATASTORE",
//"Adding stopped obj: " + obj.UUID + " to region: " + regionUUID); "Adding stopped obj: " + obj.UUID + " to region: " + regionUUID);
//addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
} }
else else
{ {

20
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -112,6 +112,7 @@ namespace OpenSim.Region.ClientStack
{ {
// TODO : Actually only handle those states that we have control over, re-throw everything else, // TODO : Actually only handle those states that we have control over, re-throw everything else,
// TODO: implement cases as we encounter them. // TODO: implement cases as we encounter them.
m_log.Error("UDPSERVER", "Connection Error! - " + e.ToString());
switch (e.SocketErrorCode) switch (e.SocketErrorCode)
{ {
case SocketError.AlreadyInProgress: case SocketError.AlreadyInProgress:
@ -179,8 +180,9 @@ namespace OpenSim.Region.ClientStack
return; return;
} }
catch (ObjectDisposedException) catch (ObjectDisposedException e)
{ {
m_log.Warn("UDPSERVER", "Connection Error! - " + e.ToString());
//MainLog.Instance.Debug("UDPSERVER", e.ToString()); //MainLog.Instance.Debug("UDPSERVER", e.ToString());
return; return;
} }
@ -191,9 +193,18 @@ namespace OpenSim.Region.ClientStack
{ {
packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); 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) if (packet != null)
@ -216,7 +227,8 @@ namespace OpenSim.Region.ClientStack
{ {
// invalid client // invalid client
//CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now //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());
} }
} }