aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTom Grimshaw2010-05-17 14:14:19 -0700
committerTom Grimshaw2010-05-17 14:32:21 -0700
commit6bc7e3429f9ac6cb57fbaa695223c3d76c189f77 (patch)
tree78d5187d6544f6d5c637978c58b43063ddde9581 /OpenSim/Region/ClientStack
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
downloadopensim-SC-6bc7e3429f9ac6cb57fbaa695223c3d76c189f77.zip
opensim-SC-6bc7e3429f9ac6cb57fbaa695223c3d76c189f77.tar.gz
opensim-SC-6bc7e3429f9ac6cb57fbaa695223c3d76c189f77.tar.bz2
opensim-SC-6bc7e3429f9ac6cb57fbaa695223c3d76c189f77.tar.xz
Provide interface to prevent the client close function from sending the stop packet
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs18
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 5c774b5..960e0a2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -470,18 +470,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
470 470
471 #region Client Methods 471 #region Client Methods
472 472
473
473 /// <summary> 474 /// <summary>
474 /// Shut down the client view 475 /// Shut down the client view
475 /// </summary> 476 /// </summary>
476 public void Close() 477 public void Close()
477 { 478 {
479 Close(true);
480 }
481
482 /// <summary>
483 /// Shut down the client view
484 /// </summary>
485 public void Close(bool sendStop)
486 {
478 m_log.DebugFormat( 487 m_log.DebugFormat(
479 "[CLIENT]: Close has been called for {0} attached to scene {1}", 488 "[CLIENT]: Close has been called for {0} attached to scene {1}",
480 Name, m_scene.RegionInfo.RegionName); 489 Name, m_scene.RegionInfo.RegionName);
481 490
482 // Send the STOP packet 491 if (sendStop)
483 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); 492 {
484 OutPacket(disable, ThrottleOutPacketType.Unknown); 493 // Send the STOP packet
494 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
495 OutPacket(disable, ThrottleOutPacketType.Unknown);
496 }
485 497
486 IsActive = false; 498 IsActive = false;
487 499