diff options
author | Teravus Ovares | 2008-04-15 06:21:44 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-15 06:21:44 +0000 |
commit | 682f4e9257bcec6e9690145760558cc3331bc5d8 (patch) | |
tree | cc3a7212426a9b5877ead378ad35a339663a838e /OpenSim/Framework/Servers | |
parent | * Committing shell of a whole-region serialiser. This is not complete and wil... (diff) | |
download | opensim-SC_OLD-682f4e9257bcec6e9690145760558cc3331bc5d8.zip opensim-SC_OLD-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.gz opensim-SC_OLD-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.bz2 opensim-SC_OLD-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.xz |
* Fixes an issue with the BaseHttpServer in Linux
* Fixes an estate naming issue
* Fixes a land issue with the landobject not reporting the proper parcel prim.
* A few other tweaks.
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 289b122..0baddb8 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -332,7 +332,14 @@ namespace OpenSim.Framework.Servers | |||
332 | } | 332 | } |
333 | finally | 333 | finally |
334 | { | 334 | { |
335 | response.OutputStream.Close(); | 335 | try |
336 | { | ||
337 | response.OutputStream.Close(); | ||
338 | } | ||
339 | catch (System.Net.Sockets.SocketException) | ||
340 | { | ||
341 | // This has to be here to prevent a Linux/Mono crash | ||
342 | } | ||
336 | } | 343 | } |
337 | } | 344 | } |
338 | 345 | ||