aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-09-18 23:37:43 +0000
committerlbsa712007-09-18 23:37:43 +0000
commit3f6b3f6b59c04dbbfe05ad43fcc9a7de24bc0ebc (patch)
tree360018ac8ddb994a9f6247bf1da59141913a4337
parent* Now at least we're not creating physActors for child agents. (diff)
downloadopensim-SC_OLD-3f6b3f6b59c04dbbfe05ad43fcc9a7de24bc0ebc.zip
opensim-SC_OLD-3f6b3f6b59c04dbbfe05ad43fcc9a7de24bc0ebc.tar.gz
opensim-SC_OLD-3f6b3f6b59c04dbbfe05ad43fcc9a7de24bc0ebc.tar.bz2
opensim-SC_OLD-3f6b3f6b59c04dbbfe05ad43fcc9a7de24bc0ebc.tar.xz
* Moved SendLogoutPacket back to IClientAPI.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs12
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs8
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs10
4 files changed, 21 insertions, 10 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 5fd5adf..344a55c 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -254,5 +254,6 @@ namespace OpenSim.Framework.Interfaces
254 event ViewerEffectEventHandler OnViewerEffect; 254 event ViewerEffectEventHandler OnViewerEffect;
255 event Action<IClientAPI> OnLogout; 255 event Action<IClientAPI> OnLogout;
256 event Action<IClientAPI> OnConnectionClosed; 256 event Action<IClientAPI> OnConnectionClosed;
257 void SendLogoutPacket();
257 } 258 }
258} 259}
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;
8using OpenSim.Framework.Types; 8using OpenSim.Framework.Types;
9using OpenSim.Framework.Utilities; 9using OpenSim.Framework.Utilities;
10using OpenSim.Region.Environment.Scenes; 10using OpenSim.Region.Environment.Scenes;
11using System;
11 12
12namespace SimpleApp 13namespace 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}