aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authordiva2009-02-11 21:07:41 +0000
committerdiva2009-02-11 21:07:41 +0000
commitb6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1 (patch)
treec7b8ebb8ce301eaacdb37929330252667143eddf /OpenSim/Region/ClientStack
parent* minor: remove some mono compiler warnings (diff)
downloadopensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.zip
opensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.tar.gz
opensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.tar.bz2
opensim-SC_OLD-b6e7e5ed424c4c26c3f86f8decbd2b15a5ab90e1.tar.xz
Enforce estate bans on Teleports.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs6
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 45915db..98d75ad 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -538,9 +538,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
538 "[CLIENT]: Close has been called with shutdownCircuit = {0} for {1} attached to scene {2}", 538 "[CLIENT]: Close has been called with shutdownCircuit = {0} for {1} attached to scene {2}",
539 shutdownCircuit, Name, m_scene.RegionInfo.RegionName); 539 shutdownCircuit, Name, m_scene.RegionInfo.RegionName);
540 540
541 m_imageManager.Close(); 541 if (m_imageManager != null)
542 m_imageManager.Close();
542 543
543 m_PacketHandler.Flush(); 544 if (m_PacketHandler != null)
545 m_PacketHandler.Flush();
544 546
545 // raise an event on the packet server to Shutdown the circuit 547 // raise an event on the packet server to Shutdown the circuit
546 // Now, if we raise the event then the packet server will call this method itself, so don't try cleanup 548 // Now, if we raise the event then the packet server will call this method itself, so don't try cleanup
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index bdc4490..eb88715 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -443,9 +443,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
443 443
444 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); 444 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
445 445
446 m_log.DebugFormat( 446 //m_log.DebugFormat(
447 "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", 447 // "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
448 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName); 448 // useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
449 } 449 }
450 } 450 }
451 451