diff options
author | Tom Grimshaw | 2010-05-17 14:14:19 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-05-17 14:32:21 -0700 |
commit | 6bc7e3429f9ac6cb57fbaa695223c3d76c189f77 (patch) | |
tree | 78d5187d6544f6d5c637978c58b43063ddde9581 /OpenSim/Client | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
download | opensim-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/Client')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 10 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 5 | ||||
-rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 5 |
3 files changed, 19 insertions, 1 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 | ||