aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-10 13:11:09 +0000
committerTeravus Ovares2008-05-10 13:11:09 +0000
commit1ba51dd2fdd658947cc94af2d788f0cc4da03a3f (patch)
tree80a7d6cdedebc5ba6ec07cdbe997e686d32a90ff /OpenSim/Region/Environment/Scenes/Scene.cs
parent* Two more OutPacket refactors. TextureSender. (diff)
downloadopensim-SC_OLD-1ba51dd2fdd658947cc94af2d788f0cc4da03a3f.zip
opensim-SC_OLD-1ba51dd2fdd658947cc94af2d788f0cc4da03a3f.tar.gz
opensim-SC_OLD-1ba51dd2fdd658947cc94af2d788f0cc4da03a3f.tar.bz2
opensim-SC_OLD-1ba51dd2fdd658947cc94af2d788f0cc4da03a3f.tar.xz
* More OutPacket refactors.
* Added back a sleep to the kick routine so users get a 'you have been logged off message' when they get kicked from the simulator for various reasons (like 'the simulator is going down')
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1f66744..2e1116b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -570,8 +570,7 @@ namespace OpenSim.Region.Environment.Scenes
570 if (!avatar.IsChildAgent) 570 if (!avatar.IsChildAgent)
571 avatar.ControllingClient.Kick("The simulator is going down."); 571 avatar.ControllingClient.Kick("The simulator is going down.");
572 572
573 avatar.ControllingClient.OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator), 573 avatar.ControllingClient.SendShutdownConnectionNotice();
574 ThrottleOutPacketType.Task);
575 }); 574 });
576 575
577 // Wait here, or the kick messages won't actually get to the agents before the scene terminates. 576 // Wait here, or the kick messages won't actually get to the agents before the scene terminates.
@@ -790,8 +789,7 @@ namespace OpenSim.Region.Environment.Scenes
790 { 789 {
791 if (!agent.IsChildAgent) 790 if (!agent.IsChildAgent)
792 { 791 {
793 pack.Header.Reliable = false; 792 agent.ControllingClient.SendSimStats(pack);
794 agent.ControllingClient.OutPacket(pack, ThrottleOutPacketType.Task);
795 } 793 }
796 } 794 }
797 } 795 }
@@ -2140,8 +2138,8 @@ namespace OpenSim.Region.Environment.Scenes
2140 m_innerScene.removeUserCount(true); 2138 m_innerScene.removeUserCount(true);
2141 } 2139 }
2142 // Tell a single agent to disconnect from the region. 2140 // Tell a single agent to disconnect from the region.
2143 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); 2141 presence.ControllingClient.SendShutdownConnectionNotice();
2144 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Unknown); 2142
2145 presence.ControllingClient.Close(true); 2143 presence.ControllingClient.Close(true);
2146 } 2144 }
2147 } 2145 }