* Moved SendLogoutPacket back to IClientAPI.

afrisby
lbsa71 2007-09-18 23:37:43 +00:00
parent f71b315592
commit 3f6b3f6b59
4 changed files with 21 additions and 10 deletions

View File

@ -254,5 +254,6 @@ namespace OpenSim.Framework.Interfaces
event ViewerEffectEventHandler OnViewerEffect; event ViewerEffectEventHandler OnViewerEffect;
event Action<IClientAPI> OnLogout; event Action<IClientAPI> OnLogout;
event Action<IClientAPI> OnConnectionClosed; event Action<IClientAPI> OnConnectionClosed;
void SendLogoutPacket();
} }
} }

View File

@ -677,5 +677,17 @@ namespace OpenSim.Region.ClientStack
shape.TextureEntry = ntex.ToBytes(); shape.TextureEntry = ntex.ToBytes();
return shape; return shape;
} }
public void SendLogoutPacket()
{
LogoutReplyPacket logReply = new LogoutReplyPacket();
logReply.AgentData.AgentID = AgentId;
logReply.AgentData.SessionID = SessionId;
logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
logReply.InventoryData[0].ItemID = LLUUID.Zero;
OutPacket(logReply);
}
} }
} }

View File

@ -149,13 +149,7 @@ namespace OpenSim.Region.ClientStack
public void LogoutHandler(IClientAPI client) public void LogoutHandler(IClientAPI client)
{ {
LogoutReplyPacket logReply = new LogoutReplyPacket(); client.SendLogoutPacket();
logReply.AgentData.AgentID = client.AgentId;
logReply.AgentData.SessionID = client.SessionId;
logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
logReply.InventoryData[0].ItemID = LLUUID.Zero;
client.OutPacket(logReply);
CloseClient( client ); CloseClient( client );
} }

View File

@ -8,6 +8,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using System;
namespace SimpleApp namespace SimpleApp
{ {
@ -20,6 +21,9 @@ namespace SimpleApp
#pragma warning disable 67 #pragma warning disable 67
public event Action<IClientAPI> OnLogout;
public event Action<IClientAPI> OnConnectionClosed;
public event ImprovedInstantMessage OnInstantMessage; public event ImprovedInstantMessage OnInstantMessage;
public event ChatFromViewer OnChatFromViewer; public event ChatFromViewer OnChatFromViewer;
public event RezObject OnRezObject; public event RezObject OnRezObject;
@ -246,8 +250,8 @@ namespace SimpleApp
} }
} }
public event System.Action<IClientAPI> OnLogout; public void SendLogoutPacket()
{
public event System.Action<IClientAPI> OnConnectionClosed; }
} }
} }