aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJeff Ames2008-08-28 14:41:54 +0000
committerJeff Ames2008-08-28 14:41:54 +0000
commit3bf88587277b83c0b6f058fabba7d46a3b5a6a00 (patch)
treeed4ad9dc27e649a6f52661665fb681984251f480 /OpenSim/Region/ClientStack
parentThannk you, Ralphos, for a patch the corrects an improper cast in (diff)
downloadopensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.zip
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.gz
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.bz2
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs7
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs4
3 files changed, 11 insertions, 14 deletions
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
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// When packetqueue dequeues this packet in the outgoing stream, it thread aborts 36 /// When packetqueue dequeues this packet in the outgoing stream, it thread aborts
37 /// Ensures that the thread abort happens from within the client thread 37 /// Ensures that the thread abort happens from within the client thread
38 /// regardless of where the close method is called 38 /// regardless of where the close method is called
39 /// </summary> 39 /// </summary>
40 class KillPacket : Packet 40 class KillPacket : Packet
@@ -42,20 +42,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
42 private Header header; 42 private Header header;
43 public override void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) 43 public override void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer)
44 { 44 {
45
46 } 45 }
47 46
48 public override void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) 47 public override void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer)
49 { 48 {
50
51 } 49 }
52 50
53 public override Header Header { get { return header; } set { header = value; }} 51 public override Header Header { get { return header; } set { header = value; }}
54 52
55 public override byte[] ToBytes() 53 public override byte[] ToBytes()
56 { 54 {
57 return new byte[0]; 55 return new byte[0];
58 } 56 }
57
59 public KillPacket() 58 public KillPacket()
60 { 59 {
61 Header = new LowHeader(); 60 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
373 public bool SendLogoutPacketWhenClosing 373 public bool SendLogoutPacketWhenClosing
374 { 374 {
375 set { m_SendLogoutPacketWhenClosing = value; } 375 set { m_SendLogoutPacketWhenClosing = value; }
376 } 376 }
377 377
378 /* METHODS */ 378 /* METHODS */
379 379
@@ -459,10 +459,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
459 { 459 {
460 GC.Collect(); 460 GC.Collect();
461 461
462 // Sends a KillPacket object, with which, the 462 // Sends a KillPacket object, with which, the
463 // blockingqueue dequeues and sees it's a killpacket 463 // blockingqueue dequeues and sees it's a killpacket
464 // and terminates within the context of the client thread. 464 // and terminates within the context of the client thread.
465 // This ensures that it's done from within the context 465 // This ensures that it's done from within the context
466 // of the client thread regardless of where Close() is called. 466 // of the client thread regardless of where Close() is called.
467 KillEndDone(); 467 KillEndDone();
468 } 468 }
@@ -2099,8 +2099,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2099 #endregion 2099 #endregion
2100 2100
2101 // Gesture 2101 // Gesture
2102
2103
2104 2102
2105 #region Appearance/ Wearables Methods 2103 #region Appearance/ Wearables Methods
2106 2104
@@ -5964,11 +5962,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5964 if (handlerActivateGesture != null) 5962 if (handlerActivateGesture != null)
5965 { 5963 {
5966 handlerActivateGesture(this, 5964 handlerActivateGesture(this,
5967 activateGesturePacket.Data[0].AssetID, 5965 activateGesturePacket.Data[0].AssetID,
5968 activateGesturePacket.Data[0].ItemID); 5966 activateGesturePacket.Data[0].ItemID);
5969 } 5967 }
5970 else m_log.Error("Null pointer for activateGesture"); 5968 else m_log.Error("Null pointer for activateGesture");
5971 5969
5972 break; 5970 break;
5973 5971
5974 case PacketType.DeactivateGestures: 5972 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
234 // to. Packet drop notifies will not be triggered in this 234 // to. Packet drop notifies will not be triggered in this
235 // configuration! 235 // configuration!
236 // 236 //
237 237
238 if ((m_SynchronizeClient != null) && (!m_Client.IsActive)) 238 if ((m_SynchronizeClient != null) && (!m_Client.IsActive))
239 { 239 {
240 if (m_SynchronizeClient(m_Client.Scene, packet, 240 if (m_SynchronizeClient(m_Client.Scene, packet,
@@ -749,7 +749,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
749 // If we sent a killpacket 749 // If we sent a killpacket
750 if (packet is KillPacket) 750 if (packet is KillPacket)
751 Thread.CurrentThread.Abort(); 751 Thread.CurrentThread.Abort();
752 752
753 // Actually make the byte array and send it 753 // Actually make the byte array and send it
754 byte[] sendbuffer = packet.ToBytes(); 754 byte[] sendbuffer = packet.ToBytes();
755 755