aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs19
1 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 1d93382..302f7ae 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -593,6 +593,7 @@ namespace OpenSim.Client.MXP.ClientStack
593 public event DisconnectUser OnDisconnectUser; 593 public event DisconnectUser OnDisconnectUser;
594 public event RequestAvatarProperties OnRequestAvatarProperties; 594 public event RequestAvatarProperties OnRequestAvatarProperties;
595 public event SetAlwaysRun OnSetAlwaysRun; 595 public event SetAlwaysRun OnSetAlwaysRun;
596 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
596 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 597 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
597 public event DeRezObject OnDeRezObject; 598 public event DeRezObject OnDeRezObject;
598 public event Action<IClientAPI> OnRegionHandShakeReply; 599 public event Action<IClientAPI> OnRegionHandShakeReply;
@@ -835,10 +836,18 @@ namespace OpenSim.Client.MXP.ClientStack
835 836
836 public void Close() 837 public void Close()
837 { 838 {
839 Close(true);
840 }
841
842 public void Close(bool sendStop)
843 {
838 m_log.Info("[MXP ClientStack] Close Called"); 844 m_log.Info("[MXP ClientStack] Close Called");
839 845
840 // Tell the client to go 846 // Tell the client to go
841 SendLogoutPacket(); 847 if (sendStop == true)
848 {
849 SendLogoutPacket();
850 }
842 851
843 // Let MXPPacketServer clean it up 852 // Let MXPPacketServer clean it up
844 if (Session.SessionState != SessionState.Disconnected) 853 if (Session.SessionState != SessionState.Disconnected)
@@ -884,7 +893,13 @@ namespace OpenSim.Client.MXP.ClientStack
884 // Need to translate to MXP somehow 893 // Need to translate to MXP somehow
885 } 894 }
886 895
887 public void SendKillObject(ulong regionHandle, uint localID) 896 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
897 {
898 foreach (uint localID in localIDs)
899 SendKillObject(regionHandle, localID);
900 }
901
902 private void SendKillObject(ulong regionHandle, uint localID)
888 { 903 {
889 DisappearanceEventMessage de = new DisappearanceEventMessage(); 904 DisappearanceEventMessage de = new DisappearanceEventMessage();
890 de.ObjectIndex = localID; 905 de.ObjectIndex = localID;