diff options
author | Tom Grimshaw | 2010-05-17 14:14:19 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-05-17 14:14:19 -0700 |
commit | 8f838c722da978da646fcef59a5af767840832bb (patch) | |
tree | 83b22c669659e26a16ca14a8ad6b6c292b805af1 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-8f838c722da978da646fcef59a5af767840832bb.zip opensim-SC-8f838c722da978da646fcef59a5af767840832bb.tar.gz opensim-SC-8f838c722da978da646fcef59a5af767840832bb.tar.bz2 opensim-SC-8f838c722da978da646fcef59a5af767840832bb.tar.xz |
When killing a zombie session, don't send the stop packet since it often has the effect of killing a newly connected client.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index d5fda9d..5670a78 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -502,18 +502,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
502 | 502 | ||
503 | #region Client Methods | 503 | #region Client Methods |
504 | 504 | ||
505 | |||
505 | /// <summary> | 506 | /// <summary> |
506 | /// Shut down the client view | 507 | /// Shut down the client view |
507 | /// </summary> | 508 | /// </summary> |
508 | public void Close() | 509 | public void Close() |
509 | { | 510 | { |
511 | Close(true); | ||
512 | } | ||
513 | |||
514 | /// <summary> | ||
515 | /// Shut down the client view | ||
516 | /// </summary> | ||
517 | public void Close(bool sendStop) | ||
518 | { | ||
510 | m_log.DebugFormat( | 519 | m_log.DebugFormat( |
511 | "[CLIENT]: Close has been called for {0} attached to scene {1}", | 520 | "[CLIENT]: Close has been called for {0} attached to scene {1}", |
512 | Name, m_scene.RegionInfo.RegionName); | 521 | Name, m_scene.RegionInfo.RegionName); |
513 | 522 | ||
514 | // Send the STOP packet | 523 | if (sendStop) |
515 | DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); | 524 | { |
516 | OutPacket(disable, ThrottleOutPacketType.Unknown); | 525 | // Send the STOP packet |
526 | DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); | ||
527 | OutPacket(disable, ThrottleOutPacketType.Unknown); | ||
528 | } | ||
517 | 529 | ||
518 | IsActive = false; | 530 | IsActive = false; |
519 | 531 | ||