ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Made it safe again to use the restart button from the estate tools and the restart console command.

Browse Source 
* It looks ugly on the console..   but it's really safe..  and restores some memory.
This commit is contained in:
Teravus Ovares
2008-04-10 10:27:03 +00:00
parent a253ac0830
commit 9fec575b3e
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,10 +208,14 @@ namespace OpenSim.Region.ClientStack
// Stupid I know..
// but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method.
}
catch (SocketException e2)
{
m_log.Error("[UDPSERVER]: " + e2.ToString());
}
catch (ObjectDisposedException)
{
}
//return;
}
@@ -264,6 +268,9 @@ namespace OpenSim.Region.ClientStack
m_log.Error("[UDPSERVER]: " + e5.ToString());
}
}
catch (ObjectDisposedException)
{
}
if (packet != null)
{

8
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -2064,10 +2064,10 @@ namespace OpenSim.Region.Physics.OdePlugin
RemovePrim(prm);
}
foreach (OdeCharacter act in _characters)
{
RemoveAvatar(act);
}
//foreach (OdeCharacter act in _characters)
//{
//RemoveAvatar(act);
//}
d.WorldDestroy(world);
//d.CloseODE();
}