aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2008-02-27 11:52:02 +0000
committerMW2008-02-27 11:52:02 +0000
commit0b7f10efedc33888e9a59973cc397be1e2457f5b (patch)
treeb9c7d455224d376be6bc4ae8995070aeb16820d1
parent* Committing file loaders - forgot yesterday. (diff)
downloadopensim-SC_OLD-0b7f10efedc33888e9a59973cc397be1e2457f5b.zip
opensim-SC_OLD-0b7f10efedc33888e9a59973cc397be1e2457f5b.tar.gz
opensim-SC_OLD-0b7f10efedc33888e9a59973cc397be1e2457f5b.tar.bz2
opensim-SC_OLD-0b7f10efedc33888e9a59973cc397be1e2457f5b.tar.xz
UserService.ClearAgent call is no longer made when a childagent connection is being closed.
DisableSimulatorPacket now skips the packet throttles
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
2 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 346bafc..de3e29d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -345,7 +345,7 @@ namespace OpenSim.Region.ClientStack
345 345
346 // Send the STOP packet 346 // Send the STOP packet
347 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); 347 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
348 OutPacket(disable, ThrottleOutPacketType.Task); 348 OutPacket(disable, ThrottleOutPacketType.Unknown);
349 349
350 m_packetQueue.Close(); 350 m_packetQueue.Close();
351 351
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1088fc1..32136be 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1555,7 +1555,10 @@ namespace OpenSim.Region.Environment.Scenes
1555 } 1555 }
1556 1556
1557 // Remove client agent from profile, so new logins will work 1557 // Remove client agent from profile, so new logins will work
1558 m_sceneGridService.ClearUserAgent(agentID); 1558 if (!avatar.IsChildAgent)
1559 {
1560 m_sceneGridService.ClearUserAgent(agentID);
1561 }
1559 1562
1560 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); 1563 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
1561 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); 1564 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
@@ -1631,10 +1634,6 @@ namespace OpenSim.Region.Environment.Scenes
1631 m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup; 1634 m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup;
1632 m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; 1635 m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
1633 1636
1634
1635
1636
1637
1638 m_sceneGridService.KillObject = SendKillObject; 1637 m_sceneGridService.KillObject = SendKillObject;
1639 } 1638 }
1640 1639
@@ -1788,7 +1787,7 @@ namespace OpenSim.Region.Environment.Scenes
1788 } 1787 }
1789 // Tell a single agent to disconnect from the region. 1788 // Tell a single agent to disconnect from the region.
1790 libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket)PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator); 1789 libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket)PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator);
1791 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Task); 1790 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Unknown);
1792 presence.ControllingClient.Close(true); 1791 presence.ControllingClient.Close(true);
1793 } 1792 }
1794 } 1793 }