aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-01 21:28:52 +0000
committerJustin Clarke Casey2008-11-01 21:28:52 +0000
commitb03e34dd2de8e58f3aaf61dbac71d1e8f99313e8 (patch)
treed0e0af8fe1a69864a0ab707cb664825f6c393914 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
parentMake the IM and friends modules optional. Clean up some code that dealt (diff)
downloadopensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.zip
opensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.gz
opensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.bz2
opensim-SC-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.xz
* Fix http://opensimulator.org/mantis/view.php?id=2517
* Don't save attachments on saving oar, which stops them coming back as ghost prims
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 52a2467..ba4e18b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -293,9 +293,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
293 { 293 {
294 CloseCircuit(reusedEpSender, e); 294 CloseCircuit(reusedEpSender, e);
295 } 295 }
296 catch (Exception a) 296 catch (Exception e2)
297 { 297 {
298 m_log.Error("[UDPSERVER]: " + a); 298 m_log.ErrorFormat(
299 "[CLIENT]: Exception thrown when trying to close the circuit for {0} - {1}", reusedEpSender, e2);
299 } 300 }
300 301
301 // ENDLESS LOOP ON PURPOSE! 302 // ENDLESS LOOP ON PURPOSE!