From 748f72326d9a295958bc9ba63bbb1a5d39030ef7 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 27 Jun 2008 23:03:39 +0000 Subject: last round of warning squashing. calling it a day now. --- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 18 +++++++++--------- OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 4 ++-- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'OpenSim/Region/ClientStack/LindenUDP') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 49174bd..08b93f3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -253,9 +253,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP private UpdateVector handlerUpdatePrimGroupScale = null; //OnUpdateGroupScale; private UpdateVector handlerUpdateVector = null; //OnUpdatePrimGroupPosition; private UpdatePrimRotation handlerUpdatePrimRotation = null; //OnUpdatePrimGroupRotation; - private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation; + // private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation; private PacketStats handlerPacketStats = null; // OnPacketStats;# - private RequestAsset handlerRequestAsset = null; // OnRequestAsset; + // private RequestAsset handlerRequestAsset = null; // OnRequestAsset; private UUIDNameRequest handlerTeleportHomeRequest = null; private ScriptAnswer handlerScriptAnswer = null; @@ -3467,7 +3467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } else { - LLUUID partId = part.UUID; + // LLUUID partId = part.UUID; UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; @@ -4135,7 +4135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP byte[] message = inchatpack.ChatData.Message; byte type = inchatpack.ChatData.Type; LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; - LLUUID fromAgentID = AgentId; + // LLUUID fromAgentID = AgentId; int channel = inchatpack.ChatData.Channel; @@ -4388,7 +4388,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP DetachAttachmentIntoInvPacket detachtoInv = (DetachAttachmentIntoInvPacket)Pack; LLUUID itemID = detachtoInv.ObjectData.ItemID; - LLUUID ATTACH_agentID = detachtoInv.ObjectData.AgentID; + // LLUUID ATTACH_agentID = detachtoInv.ObjectData.AgentID; handlerDetachAttachmentIntoInv(itemID, this); } @@ -5938,7 +5938,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP break; case PacketType.RequestRegionInfo: - RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; + // RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; handlerRegionInfoRequest = OnRegionInfoRequest; if (handlerRegionInfoRequest != null) @@ -5948,8 +5948,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP break; case PacketType.EstateCovenantRequest: - EstateCovenantRequestPacket.AgentDataBlock epack = - ((EstateCovenantRequestPacket)Pack).AgentData; + // EstateCovenantRequestPacket.AgentDataBlock epack = + // ((EstateCovenantRequestPacket)Pack).AgentData; handlerEstateCovenantRequest = OnEstateCovenantRequest; if (handlerEstateCovenantRequest != null) @@ -6287,7 +6287,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia) { LandStatReplyPacket lsrp = new LandStatReplyPacket(); - LandStatReplyPacket.RequestDataBlock lsreqdpb = new LandStatReplyPacket.RequestDataBlock(); + // LandStatReplyPacket.RequestDataBlock lsreqdpb = new LandStatReplyPacket.RequestDataBlock(); LandStatReplyPacket.ReportDataBlock[] lsrepdba = new LandStatReplyPacket.ReportDataBlock[lsrpia.Length]; //LandStatReplyPacket.ReportDataBlock lsrepdb = new LandStatReplyPacket.ReportDataBlock(); // lsrepdb. diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 3786489..51dcde7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs @@ -57,8 +57,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP private Queue TextureOutgoingPacketQueue; private Queue AssetOutgoingPacketQueue; - private Dictionary PendingAcks = new Dictionary(); - private Dictionary NeedAck = new Dictionary(); + // private Dictionary PendingAcks = new Dictionary(); + // private Dictionary NeedAck = new Dictionary(); // All throttle times and number of bytes are calculated by dividing by this value // This value also determines how many times per throttletimems the timer will run diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index eb4b8e7..d705ef2 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -418,9 +418,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); m_socket.Bind(ServerIncoming); // Add flags to the UDP socket to prevent "Socket forcibly closed by host" - uint IOC_IN = 0x80000000; - uint IOC_VENDOR = 0x18000000; - uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12; + // uint IOC_IN = 0x80000000; + // uint IOC_VENDOR = 0x18000000; + // uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12; // TODO: this apparently works in .NET but not in Mono, need to sort out the right flags here. // m_socket.IOControl((int)SIO_UDP_CONNRESET, new byte[] { Convert.ToByte(false) }, null); -- cgit v1.1