aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-10 10:27:03 +0000
committerTeravus Ovares2008-04-10 10:27:03 +0000
commit9fec575b3eaaee7d0b5126498662a8ebbc4f61ca (patch)
tree7e1f252cd215773be6e890addb965c50b8b766f4
parentPatch by lulurun - 0000916: support secondlife client's "-url sim/x/y/z" option (diff)
downloadopensim-SC_OLD-9fec575b3eaaee7d0b5126498662a8ebbc4f61ca.zip
opensim-SC_OLD-9fec575b3eaaee7d0b5126498662a8ebbc4f61ca.tar.gz
opensim-SC_OLD-9fec575b3eaaee7d0b5126498662a8ebbc4f61ca.tar.bz2
opensim-SC_OLD-9fec575b3eaaee7d0b5126498662a8ebbc4f61ca.tar.xz
* Made it safe again to use the restart button from the estate tools and the restart console command.
* It looks ugly on the console.. but it's really safe.. and restores some memory.
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs7
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs8
2 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 59083c7..3d1512f 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -208,10 +208,14 @@ namespace OpenSim.Region.ClientStack
208 // Stupid I know.. 208 // Stupid I know..
209 // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method. 209 // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method.
210 } 210 }
211
211 catch (SocketException e2) 212 catch (SocketException e2)
212 { 213 {
213 m_log.Error("[UDPSERVER]: " + e2.ToString()); 214 m_log.Error("[UDPSERVER]: " + e2.ToString());
214 } 215 }
216 catch (ObjectDisposedException)
217 {
218 }
215 //return; 219 //return;
216 } 220 }
217 221
@@ -264,6 +268,9 @@ namespace OpenSim.Region.ClientStack
264 m_log.Error("[UDPSERVER]: " + e5.ToString()); 268 m_log.Error("[UDPSERVER]: " + e5.ToString());
265 } 269 }
266 } 270 }
271 catch (ObjectDisposedException)
272 {
273 }
267 274
268 if (packet != null) 275 if (packet != null)
269 { 276 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index fa128de..a2f440e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2064,10 +2064,10 @@ namespace OpenSim.Region.Physics.OdePlugin
2064 RemovePrim(prm); 2064 RemovePrim(prm);
2065 } 2065 }
2066 2066
2067 foreach (OdeCharacter act in _characters) 2067 //foreach (OdeCharacter act in _characters)
2068 { 2068 //{
2069 RemoveAvatar(act); 2069 //RemoveAvatar(act);
2070 } 2070 //}
2071 d.WorldDestroy(world); 2071 d.WorldDestroy(world);
2072 //d.CloseODE(); 2072 //d.CloseODE();
2073 } 2073 }