diff options
Diffstat (limited to 'OpenSim/Client')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 15 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 10 | ||||
-rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 10 |
3 files changed, 34 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index af9478e..87b99e0 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) |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index c1e281a..e36b797 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
@@ -253,6 +253,7 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
253 | public event AddNewPrim OnAddPrim; | 253 | public event AddNewPrim OnAddPrim; |
254 | public event FetchInventory OnAgentDataUpdateRequest; | 254 | public event FetchInventory OnAgentDataUpdateRequest; |
255 | public event TeleportLocationRequest OnSetStartLocationRequest; | 255 | public event TeleportLocationRequest OnSetStartLocationRequest; |
256 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | ||
256 | public event RequestGodlikePowers OnRequestGodlikePowers; | 257 | public event RequestGodlikePowers OnRequestGodlikePowers; |
257 | public event GodKickUser OnGodKickUser; | 258 | public event GodKickUser OnGodKickUser; |
258 | public event ObjectDuplicate OnObjectDuplicate; | 259 | public event ObjectDuplicate OnObjectDuplicate; |
@@ -439,6 +440,10 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
439 | throw new System.NotImplementedException(); | 440 | throw new System.NotImplementedException(); |
440 | } | 441 | } |
441 | 442 | ||
443 | public void ProcessPendingPackets() | ||
444 | { | ||
445 | } | ||
446 | |||
442 | public void ProcessInPacket(Packet NewPack) | 447 | public void ProcessInPacket(Packet NewPack) |
443 | { | 448 | { |
444 | throw new System.NotImplementedException(); | 449 | throw new System.NotImplementedException(); |
@@ -446,6 +451,11 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
446 | 451 | ||
447 | public void Close() | 452 | public void Close() |
448 | { | 453 | { |
454 | Close(true); | ||
455 | } | ||
456 | |||
457 | public void Close(bool sendStop) | ||
458 | { | ||
449 | throw new System.NotImplementedException(); | 459 | throw new System.NotImplementedException(); |
450 | } | 460 | } |
451 | 461 | ||
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 99a46dc..51c5c17 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -290,6 +290,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
290 | public event GenericCall2 OnStopMovement = delegate { }; | 290 | public event GenericCall2 OnStopMovement = delegate { }; |
291 | public event Action<UUID> OnRemoveAvatar = delegate { }; | 291 | public event Action<UUID> OnRemoveAvatar = delegate { }; |
292 | public event ObjectPermissions OnObjectPermissions = delegate { }; | 292 | public event ObjectPermissions OnObjectPermissions = delegate { }; |
293 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy = delegate { }; | ||
293 | public event CreateNewInventoryItem OnCreateNewInventoryItem = delegate { }; | 294 | public event CreateNewInventoryItem OnCreateNewInventoryItem = delegate { }; |
294 | public event LinkInventoryItem OnLinkInventoryItem = delegate { }; | 295 | public event LinkInventoryItem OnLinkInventoryItem = delegate { }; |
295 | public event CreateInventoryFolder OnCreateNewInventoryFolder = delegate { }; | 296 | public event CreateInventoryFolder OnCreateNewInventoryFolder = delegate { }; |
@@ -445,6 +446,10 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
445 | throw new System.NotImplementedException(); | 446 | throw new System.NotImplementedException(); |
446 | } | 447 | } |
447 | 448 | ||
449 | public void ProcessPendingPackets() | ||
450 | { | ||
451 | } | ||
452 | |||
448 | public void ProcessInPacket(Packet NewPack) | 453 | public void ProcessInPacket(Packet NewPack) |
449 | { | 454 | { |
450 | throw new System.NotImplementedException(); | 455 | throw new System.NotImplementedException(); |
@@ -452,6 +457,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
452 | 457 | ||
453 | public void Close() | 458 | public void Close() |
454 | { | 459 | { |
460 | Close(true); | ||
461 | } | ||
462 | |||
463 | public void Close(bool sendStop) | ||
464 | { | ||
455 | throw new System.NotImplementedException(); | 465 | throw new System.NotImplementedException(); |
456 | } | 466 | } |
457 | 467 | ||