diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 6 |
3 files changed, 14 insertions, 14 deletions
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 | |||
253 | private UpdateVector handlerUpdatePrimGroupScale = null; //OnUpdateGroupScale; | 253 | private UpdateVector handlerUpdatePrimGroupScale = null; //OnUpdateGroupScale; |
254 | private UpdateVector handlerUpdateVector = null; //OnUpdatePrimGroupPosition; | 254 | private UpdateVector handlerUpdateVector = null; //OnUpdatePrimGroupPosition; |
255 | private UpdatePrimRotation handlerUpdatePrimRotation = null; //OnUpdatePrimGroupRotation; | 255 | private UpdatePrimRotation handlerUpdatePrimRotation = null; //OnUpdatePrimGroupRotation; |
256 | private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation; | 256 | // private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation; |
257 | private PacketStats handlerPacketStats = null; // OnPacketStats;# | 257 | private PacketStats handlerPacketStats = null; // OnPacketStats;# |
258 | private RequestAsset handlerRequestAsset = null; // OnRequestAsset; | 258 | // private RequestAsset handlerRequestAsset = null; // OnRequestAsset; |
259 | private UUIDNameRequest handlerTeleportHomeRequest = null; | 259 | private UUIDNameRequest handlerTeleportHomeRequest = null; |
260 | 260 | ||
261 | private ScriptAnswer handlerScriptAnswer = null; | 261 | private ScriptAnswer handlerScriptAnswer = null; |
@@ -3467,7 +3467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3467 | } | 3467 | } |
3468 | else | 3468 | else |
3469 | { | 3469 | { |
3470 | LLUUID partId = part.UUID; | 3470 | // LLUUID partId = part.UUID; |
3471 | UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; | 3471 | UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; |
3472 | UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; | 3472 | UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; |
3473 | 3473 | ||
@@ -4135,7 +4135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4135 | byte[] message = inchatpack.ChatData.Message; | 4135 | byte[] message = inchatpack.ChatData.Message; |
4136 | byte type = inchatpack.ChatData.Type; | 4136 | byte type = inchatpack.ChatData.Type; |
4137 | LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; | 4137 | LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; |
4138 | LLUUID fromAgentID = AgentId; | 4138 | // LLUUID fromAgentID = AgentId; |
4139 | 4139 | ||
4140 | int channel = inchatpack.ChatData.Channel; | 4140 | int channel = inchatpack.ChatData.Channel; |
4141 | 4141 | ||
@@ -4388,7 +4388,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4388 | DetachAttachmentIntoInvPacket detachtoInv = (DetachAttachmentIntoInvPacket)Pack; | 4388 | DetachAttachmentIntoInvPacket detachtoInv = (DetachAttachmentIntoInvPacket)Pack; |
4389 | 4389 | ||
4390 | LLUUID itemID = detachtoInv.ObjectData.ItemID; | 4390 | LLUUID itemID = detachtoInv.ObjectData.ItemID; |
4391 | LLUUID ATTACH_agentID = detachtoInv.ObjectData.AgentID; | 4391 | // LLUUID ATTACH_agentID = detachtoInv.ObjectData.AgentID; |
4392 | 4392 | ||
4393 | handlerDetachAttachmentIntoInv(itemID, this); | 4393 | handlerDetachAttachmentIntoInv(itemID, this); |
4394 | } | 4394 | } |
@@ -5938,7 +5938,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5938 | break; | 5938 | break; |
5939 | 5939 | ||
5940 | case PacketType.RequestRegionInfo: | 5940 | case PacketType.RequestRegionInfo: |
5941 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; | 5941 | // RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; |
5942 | 5942 | ||
5943 | handlerRegionInfoRequest = OnRegionInfoRequest; | 5943 | handlerRegionInfoRequest = OnRegionInfoRequest; |
5944 | if (handlerRegionInfoRequest != null) | 5944 | if (handlerRegionInfoRequest != null) |
@@ -5948,8 +5948,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5948 | break; | 5948 | break; |
5949 | case PacketType.EstateCovenantRequest: | 5949 | case PacketType.EstateCovenantRequest: |
5950 | 5950 | ||
5951 | EstateCovenantRequestPacket.AgentDataBlock epack = | 5951 | // EstateCovenantRequestPacket.AgentDataBlock epack = |
5952 | ((EstateCovenantRequestPacket)Pack).AgentData; | 5952 | // ((EstateCovenantRequestPacket)Pack).AgentData; |
5953 | 5953 | ||
5954 | handlerEstateCovenantRequest = OnEstateCovenantRequest; | 5954 | handlerEstateCovenantRequest = OnEstateCovenantRequest; |
5955 | if (handlerEstateCovenantRequest != null) | 5955 | if (handlerEstateCovenantRequest != null) |
@@ -6287,7 +6287,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6287 | public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia) | 6287 | public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia) |
6288 | { | 6288 | { |
6289 | LandStatReplyPacket lsrp = new LandStatReplyPacket(); | 6289 | LandStatReplyPacket lsrp = new LandStatReplyPacket(); |
6290 | LandStatReplyPacket.RequestDataBlock lsreqdpb = new LandStatReplyPacket.RequestDataBlock(); | 6290 | // LandStatReplyPacket.RequestDataBlock lsreqdpb = new LandStatReplyPacket.RequestDataBlock(); |
6291 | LandStatReplyPacket.ReportDataBlock[] lsrepdba = new LandStatReplyPacket.ReportDataBlock[lsrpia.Length]; | 6291 | LandStatReplyPacket.ReportDataBlock[] lsrepdba = new LandStatReplyPacket.ReportDataBlock[lsrpia.Length]; |
6292 | //LandStatReplyPacket.ReportDataBlock lsrepdb = new LandStatReplyPacket.ReportDataBlock(); | 6292 | //LandStatReplyPacket.ReportDataBlock lsrepdb = new LandStatReplyPacket.ReportDataBlock(); |
6293 | // lsrepdb. | 6293 | // 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 | |||
57 | private Queue<LLQueItem> TextureOutgoingPacketQueue; | 57 | private Queue<LLQueItem> TextureOutgoingPacketQueue; |
58 | private Queue<LLQueItem> AssetOutgoingPacketQueue; | 58 | private Queue<LLQueItem> AssetOutgoingPacketQueue; |
59 | 59 | ||
60 | private Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>(); | 60 | // private Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>(); |
61 | private Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>(); | 61 | // private Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>(); |
62 | 62 | ||
63 | // All throttle times and number of bytes are calculated by dividing by this value | 63 | // All throttle times and number of bytes are calculated by dividing by this value |
64 | // This value also determines how many times per throttletimems the timer will run | 64 | // 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 | |||
418 | m_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); | 418 | m_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); |
419 | m_socket.Bind(ServerIncoming); | 419 | m_socket.Bind(ServerIncoming); |
420 | // Add flags to the UDP socket to prevent "Socket forcibly closed by host" | 420 | // Add flags to the UDP socket to prevent "Socket forcibly closed by host" |
421 | uint IOC_IN = 0x80000000; | 421 | // uint IOC_IN = 0x80000000; |
422 | uint IOC_VENDOR = 0x18000000; | 422 | // uint IOC_VENDOR = 0x18000000; |
423 | uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12; | 423 | // uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12; |
424 | // TODO: this apparently works in .NET but not in Mono, need to sort out the right flags here. | 424 | // TODO: this apparently works in .NET but not in Mono, need to sort out the right flags here. |
425 | // m_socket.IOControl((int)SIO_UDP_CONNRESET, new byte[] { Convert.ToByte(false) }, null); | 425 | // m_socket.IOControl((int)SIO_UDP_CONNRESET, new byte[] { Convert.ToByte(false) }, null); |
426 | 426 | ||