From 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 25 May 2008 23:27:38 +0000 Subject: Update svn properties. Formatting cleanup. --- .../Region/ClientStack/LindenUDP/LLClientView.cs | 25 ++++++++++------------ .../Region/ClientStack/LindenUDP/LLPacketQueue.cs | 4 ++-- 2 files changed, 13 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/ClientStack/LindenUDP') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 11fb5be..e27a003 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -98,7 +98,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP private Dictionary m_defaultAnimations = new Dictionary(); - /* protected variables */ protected static Dictionary PacketHandlers = @@ -413,7 +412,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP Thread.Sleep(2000); - // Shut down timers m_ackTimer.Stop(); m_clientPingTimer.Stop(); @@ -782,7 +780,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event TeleportLocationRequest OnSetStartLocationRequest; public event UpdateAvatarProperties OnUpdateAvatarProperties; - public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateInventoryFolder OnCreateNewInventoryFolder; public event UpdateInventoryFolder OnUpdateInventoryFolder; @@ -937,13 +934,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// /// - public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, + public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible) { SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID, source, audible); } - public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, + public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible) { ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); @@ -3172,7 +3169,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack) { - + ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; handlerObjectGroupRequest = OnObjectGroupRequest; if (handlerObjectGroupRequest != null) @@ -3185,7 +3182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return true; } - + private bool HandleViewerEffect(IClientAPI sender, Packet Pack) { @@ -3875,7 +3872,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } else { - + switch (Pack.Type) { #region Scene/Avatar @@ -5427,10 +5424,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP } break; case PacketType.ParcelReturnObjects: - + ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; - + LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; @@ -5444,10 +5441,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (handlerParcelReturnObjectsRequest != null) { handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); - + } break; - + #endregion #region Estate Packets @@ -5666,7 +5663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP break; case PacketType.LandStatRequest: LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; - + handlerLandStatRequest = OnLandStatRequest; if (handlerLandStatRequest != null) { @@ -5678,7 +5675,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts //lsrp.RequestData.RequestFlags; //lsrp.RequestData.Filter; - + break; case PacketType.RequestRegionInfo: diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index fb14a35..3786489 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { public class LLPacketQueue : IPullStatsProvider { - private static readonly log4net.ILog m_log + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private bool m_enabled = true; @@ -424,7 +424,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!"); return; } - + int tResend = -1; int tLand = -1; int tWind = -1; -- cgit v1.1