aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs10
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs5
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs5
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs18
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs5
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs4
9 files changed, 54 insertions, 4 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 33017d6..658ddf0 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -827,10 +827,18 @@ namespace OpenSim.Client.MXP.ClientStack
827 827
828 public void Close() 828 public void Close()
829 { 829 {
830 Close(true);
831 }
832
833 public void Close(bool sendStop)
834 {
830 m_log.Info("[MXP ClientStack] Close Called"); 835 m_log.Info("[MXP ClientStack] Close Called");
831 836
832 // Tell the client to go 837 // Tell the client to go
833 SendLogoutPacket(); 838 if (sendStop == true)
839 {
840 SendLogoutPacket();
841 }
834 842
835 // Let MXPPacketServer clean it up 843 // Let MXPPacketServer clean it up
836 if (Session.SessionState != SessionState.Disconnected) 844 if (Session.SessionState != SessionState.Disconnected)
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 1bdc4f8..c2ddd36 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -439,6 +439,11 @@ namespace OpenSim.Client.Sirikata.ClientStack
439 439
440 public void Close() 440 public void Close()
441 { 441 {
442 Close(true);
443 }
444
445 public void Close(bool sendStop)
446 {
442 throw new System.NotImplementedException(); 447 throw new System.NotImplementedException();
443 } 448 }
444 449
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index f45cb44..df07807 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -446,6 +446,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
446 446
447 public void Close() 447 public void Close()
448 { 448 {
449 Close(true);
450 }
451
452 public void Close(bool sendStop)
453 {
449 throw new System.NotImplementedException(); 454 throw new System.NotImplementedException();
450 } 455 }
451 456
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index bcbc957..bc8ce1a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1101,6 +1101,7 @@ namespace OpenSim.Framework
1101 void InPacket(object NewPack); 1101 void InPacket(object NewPack);
1102 void ProcessInPacket(Packet NewPack); 1102 void ProcessInPacket(Packet NewPack);
1103 void Close(); 1103 void Close();
1104 void Close(bool sendStop);
1104 void Kick(string message); 1105 void Kick(string message);
1105 1106
1106 /// <summary> 1107 /// <summary>
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
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index d2b0161..b074313 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -825,6 +825,11 @@ namespace OpenSim.Region.Examples.SimpleModule
825 825
826 public void Close() 826 public void Close()
827 { 827 {
828 Close(true);
829 }
830
831 public void Close(bool sendStop)
832 {
828 } 833 }
829 834
830 public void Start() 835 public void Start()
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 85e3fb3..0b6647d 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -877,6 +877,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
877 877
878 public void Close() 878 public void Close()
879 { 879 {
880 Close(true);
881 }
882
883 public void Close(bool sendStop)
884 {
880 Disconnect(); 885 Disconnect();
881 } 886 }
882 887
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index cf2076f..938293f 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -838,6 +838,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
838 838
839 public void Close() 839 public void Close()
840 { 840 {
841 Close(true);
842 }
843
844 public void Close(bool sendStop)
845 {
841 } 846 }
842 847
843 public void Start() 848 public void Start()
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 68ac96a..752e9e1 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -882,6 +882,10 @@ namespace OpenSim.Tests.Common.Mock
882 882
883 public void Close() 883 public void Close()
884 { 884 {
885 Close(true);
886 }
887 public void Close(bool sendStop)
888 {
885 m_scene.RemoveClient(AgentId); 889 m_scene.RemoveClient(AgentId);
886 } 890 }
887 891