diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/PacketServer.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 10 |
3 files changed, 20 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 009ddac..3bb7c03 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -677,5 +677,17 @@ namespace OpenSim.Region.ClientStack | |||
677 | shape.TextureEntry = ntex.ToBytes(); | 677 | shape.TextureEntry = ntex.ToBytes(); |
678 | return shape; | 678 | return shape; |
679 | } | 679 | } |
680 | |||
681 | public void SendLogoutPacket() | ||
682 | { | ||
683 | LogoutReplyPacket logReply = new LogoutReplyPacket(); | ||
684 | logReply.AgentData.AgentID = AgentId; | ||
685 | logReply.AgentData.SessionID = SessionId; | ||
686 | logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1]; | ||
687 | logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock(); | ||
688 | logReply.InventoryData[0].ItemID = LLUUID.Zero; | ||
689 | |||
690 | OutPacket(logReply); | ||
691 | } | ||
680 | } | 692 | } |
681 | } | 693 | } |
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index 28f25bd..3b26a59 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs | |||
@@ -149,13 +149,7 @@ namespace OpenSim.Region.ClientStack | |||
149 | 149 | ||
150 | public void LogoutHandler(IClientAPI client) | 150 | public void LogoutHandler(IClientAPI client) |
151 | { | 151 | { |
152 | LogoutReplyPacket logReply = new LogoutReplyPacket(); | 152 | client.SendLogoutPacket(); |
153 | logReply.AgentData.AgentID = client.AgentId; | ||
154 | logReply.AgentData.SessionID = client.SessionId; | ||
155 | logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1]; | ||
156 | logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock(); | ||
157 | logReply.InventoryData[0].ItemID = LLUUID.Zero; | ||
158 | client.OutPacket(logReply); | ||
159 | 153 | ||
160 | CloseClient( client ); | 154 | CloseClient( client ); |
161 | } | 155 | } |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index 9839b0c..d2dce6b 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | |||
@@ -8,6 +8,7 @@ using OpenSim.Framework.Interfaces; | |||
8 | using OpenSim.Framework.Types; | 8 | using OpenSim.Framework.Types; |
9 | using OpenSim.Framework.Utilities; | 9 | using OpenSim.Framework.Utilities; |
10 | using OpenSim.Region.Environment.Scenes; | 10 | using OpenSim.Region.Environment.Scenes; |
11 | using System; | ||
11 | 12 | ||
12 | namespace SimpleApp | 13 | namespace SimpleApp |
13 | { | 14 | { |
@@ -20,6 +21,9 @@ namespace SimpleApp | |||
20 | 21 | ||
21 | #pragma warning disable 67 | 22 | #pragma warning disable 67 |
22 | 23 | ||
24 | public event Action<IClientAPI> OnLogout; | ||
25 | public event Action<IClientAPI> OnConnectionClosed; | ||
26 | |||
23 | public event ImprovedInstantMessage OnInstantMessage; | 27 | public event ImprovedInstantMessage OnInstantMessage; |
24 | public event ChatFromViewer OnChatFromViewer; | 28 | public event ChatFromViewer OnChatFromViewer; |
25 | public event RezObject OnRezObject; | 29 | public event RezObject OnRezObject; |
@@ -246,8 +250,8 @@ namespace SimpleApp | |||
246 | } | 250 | } |
247 | } | 251 | } |
248 | 252 | ||
249 | public event System.Action<IClientAPI> OnLogout; | 253 | public void SendLogoutPacket() |
250 | 254 | { | |
251 | public event System.Action<IClientAPI> OnConnectionClosed; | 255 | } |
252 | } | 256 | } |
253 | } | 257 | } |