From 3bf88587277b83c0b6f058fabba7d46a3b5a6a00 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 28 Aug 2008 14:41:54 +0000 Subject: Update svn properties, formatting cleanup. --- OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs | 7 +++---- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 ++++++-------- OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) (limited to 'OpenSim/Region/ClientStack') diff --git a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs index 616d8d9..d7d9128 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs @@ -34,7 +34,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { /// /// When packetqueue dequeues this packet in the outgoing stream, it thread aborts - /// Ensures that the thread abort happens from within the client thread + /// Ensures that the thread abort happens from within the client thread /// regardless of where the close method is called /// class KillPacket : Packet @@ -42,20 +42,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP private Header header; public override void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) { - } public override void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) { - } - + public override Header Header { get { return header; } set { header = value; }} public override byte[] ToBytes() { return new byte[0]; } + public KillPacket() { Header = new LowHeader(); diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index fc99334..0a067d5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -373,7 +373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } - } + } /* METHODS */ @@ -459,10 +459,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GC.Collect(); - // Sends a KillPacket object, with which, the - // blockingqueue dequeues and sees it's a killpacket + // Sends a KillPacket object, with which, the + // blockingqueue dequeues and sees it's a killpacket // and terminates within the context of the client thread. - // This ensures that it's done from within the context + // This ensures that it's done from within the context // of the client thread regardless of where Close() is called. KillEndDone(); } @@ -2099,8 +2099,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP #endregion // Gesture - - #region Appearance/ Wearables Methods @@ -5964,11 +5962,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (handlerActivateGesture != null) { handlerActivateGesture(this, - activateGesturePacket.Data[0].AssetID, + activateGesturePacket.Data[0].AssetID, activateGesturePacket.Data[0].ItemID); } else m_log.Error("Null pointer for activateGesture"); - + break; case PacketType.DeactivateGestures: diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index e874394..551e7ab 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs @@ -234,7 +234,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // to. Packet drop notifies will not be triggered in this // configuration! // - + if ((m_SynchronizeClient != null) && (!m_Client.IsActive)) { if (m_SynchronizeClient(m_Client.Scene, packet, @@ -749,7 +749,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // If we sent a killpacket if (packet is KillPacket) Thread.CurrentThread.Abort(); - + // Actually make the byte array and send it byte[] sendbuffer = packet.ToBytes(); -- cgit v1.1