diff options
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 19331c6..a720db4 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; |
@@ -819,6 +820,10 @@ namespace OpenSim.Client.MXP.ClientStack | |||
819 | //throw new System.NotImplementedException(); | 820 | //throw new System.NotImplementedException(); |
820 | } | 821 | } |
821 | 822 | ||
823 | public void ProcessPendingPackets() | ||
824 | { | ||
825 | } | ||
826 | |||
822 | public void ProcessInPacket(Packet NewPack) | 827 | public void ProcessInPacket(Packet NewPack) |
823 | { | 828 | { |
824 | //throw new System.NotImplementedException(); | 829 | //throw new System.NotImplementedException(); |
@@ -835,10 +840,18 @@ namespace OpenSim.Client.MXP.ClientStack | |||
835 | 840 | ||
836 | public void Close() | 841 | public void Close() |
837 | { | 842 | { |
843 | Close(true); | ||
844 | } | ||
845 | |||
846 | public void Close(bool sendStop) | ||
847 | { | ||
838 | m_log.Info("[MXP ClientStack] Close Called"); | 848 | m_log.Info("[MXP ClientStack] Close Called"); |
839 | 849 | ||
840 | // Tell the client to go | 850 | // Tell the client to go |
841 | SendLogoutPacket(); | 851 | if (sendStop == true) |
852 | { | ||
853 | SendLogoutPacket(); | ||
854 | } | ||
842 | 855 | ||
843 | // Let MXPPacketServer clean it up | 856 | // Let MXPPacketServer clean it up |
844 | if (Session.SessionState != SessionState.Disconnected) | 857 | if (Session.SessionState != SessionState.Disconnected) |
@@ -884,7 +897,13 @@ namespace OpenSim.Client.MXP.ClientStack | |||
884 | // Need to translate to MXP somehow | 897 | // Need to translate to MXP somehow |
885 | } | 898 | } |
886 | 899 | ||
887 | public void SendKillObject(ulong regionHandle, uint localID) | 900 | public void SendKillObject(ulong regionHandle, List<uint> localIDs) |
901 | { | ||
902 | foreach (uint localID in localIDs) | ||
903 | SendKillObject(regionHandle, localID); | ||
904 | } | ||
905 | |||
906 | private void SendKillObject(ulong regionHandle, uint localID) | ||
888 | { | 907 | { |
889 | DisappearanceEventMessage de = new DisappearanceEventMessage(); | 908 | DisappearanceEventMessage de = new DisappearanceEventMessage(); |
890 | de.ObjectIndex = localID; | 909 | de.ObjectIndex = localID; |