aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs35
1 files changed, 9 insertions, 26 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ac30868..aeb728e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6347,7 +6347,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6347 rinfopack.AgentData.SessionID = SessionId; 6347 rinfopack.AgentData.SessionID = SessionId;
6348 rinfoblk.BillableFactor = args.billableFactor; 6348 rinfoblk.BillableFactor = args.billableFactor;
6349 rinfoblk.EstateID = args.estateID; 6349 rinfoblk.EstateID = args.estateID;
6350 rinfoblk.MaxAgents = args.maxAgents; 6350 rinfoblk.MaxAgents = (byte)args.maxAgents;
6351 rinfoblk.ObjectBonusFactor = args.objectBonusFactor; 6351 rinfoblk.ObjectBonusFactor = args.objectBonusFactor;
6352 rinfoblk.ParentEstateID = args.parentEstateID; 6352 rinfoblk.ParentEstateID = args.parentEstateID;
6353 rinfoblk.PricePerMeter = args.pricePerMeter; 6353 rinfoblk.PricePerMeter = args.pricePerMeter;
@@ -6363,9 +6363,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6363 rinfoblk.SimName = Utils.StringToBytes(args.simName); 6363 rinfoblk.SimName = Utils.StringToBytes(args.simName);
6364 6364
6365 rinfopack.RegionInfo2 = new RegionInfoPacket.RegionInfo2Block(); 6365 rinfopack.RegionInfo2 = new RegionInfoPacket.RegionInfo2Block();
6366 rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue; 6366 rinfopack.RegionInfo2.HardMaxAgents = (uint)args.AgentCapacity;
6367 rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue; 6367 rinfopack.RegionInfo2.HardMaxObjects = (uint)args.ObjectsCapacity;
6368 rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue; 6368 rinfopack.RegionInfo2.MaxAgents32 = (uint)args.maxAgents;
6369 rinfopack.RegionInfo2.ProductName = Util.StringToBytes256(args.regionType); 6369 rinfopack.RegionInfo2.ProductName = Util.StringToBytes256(args.regionType);
6370 rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes; 6370 rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes;
6371 6371
@@ -8013,7 +8013,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8013 AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest); 8013 AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
8014 AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer); 8014 AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
8015 AddLocalPacketHandler(PacketType.SendXferPacket, HandleSendXferPacket); 8015 AddLocalPacketHandler(PacketType.SendXferPacket, HandleSendXferPacket);
8016 AddLocalPacketHandler(PacketType.ConfirmXferPacket, HandleConfirmXferPacket); 8016 AddLocalPacketHandler(PacketType.ConfirmXferPacket, HandleConfirmXferPacket, false);
8017 AddLocalPacketHandler(PacketType.AbortXfer, HandleAbortXfer); 8017 AddLocalPacketHandler(PacketType.AbortXfer, HandleAbortXfer);
8018 AddLocalPacketHandler(PacketType.CreateInventoryFolder, HandleCreateInventoryFolder); 8018 AddLocalPacketHandler(PacketType.CreateInventoryFolder, HandleCreateInventoryFolder);
8019 AddLocalPacketHandler(PacketType.UpdateInventoryFolder, HandleUpdateInventoryFolder); 8019 AddLocalPacketHandler(PacketType.UpdateInventoryFolder, HandleUpdateInventoryFolder);
@@ -10636,12 +10636,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10636 { 10636 {
10637 RequestXferPacket xferReq = (RequestXferPacket)Pack; 10637 RequestXferPacket xferReq = (RequestXferPacket)Pack;
10638 10638
10639 RequestXfer handlerRequestXfer = OnRequestXfer; 10639 OnRequestXfer?.Invoke(this, xferReq.XferID.ID, Util.FieldToString(xferReq.XferID.Filename));
10640
10641 if (handlerRequestXfer != null)
10642 {
10643 handlerRequestXfer(this, xferReq.XferID.ID, Util.FieldToString(xferReq.XferID.Filename));
10644 }
10645 return true; 10640 return true;
10646 } 10641 }
10647 10642
@@ -10649,11 +10644,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10649 { 10644 {
10650 SendXferPacketPacket xferRec = (SendXferPacketPacket)Pack; 10645 SendXferPacketPacket xferRec = (SendXferPacketPacket)Pack;
10651 10646
10652 XferReceive handlerXferReceive = OnXferReceive; 10647 OnXferReceive?.Invoke(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data);
10653 if (handlerXferReceive != null)
10654 {
10655 handlerXferReceive(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data);
10656 }
10657 return true; 10648 return true;
10658 } 10649 }
10659 10650
@@ -10661,23 +10652,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10661 { 10652 {
10662 ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack; 10653 ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack;
10663 10654
10664 ConfirmXfer handlerConfirmXfer = OnConfirmXfer; 10655 OnConfirmXfer?.Invoke(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet);
10665 if (handlerConfirmXfer != null)
10666 {
10667 handlerConfirmXfer(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet);
10668 }
10669 return true; 10656 return true;
10670 } 10657 }
10671 10658
10672 private bool HandleAbortXfer(IClientAPI sender, Packet Pack) 10659 private bool HandleAbortXfer(IClientAPI sender, Packet Pack)
10673 { 10660 {
10674 AbortXferPacket abortXfer = (AbortXferPacket)Pack; 10661 AbortXferPacket abortXfer = (AbortXferPacket)Pack;
10675 AbortXfer handlerAbortXfer = OnAbortXfer;
10676 if (handlerAbortXfer != null)
10677 {
10678 handlerAbortXfer(this, abortXfer.XferID.ID);
10679 }
10680 10662
10663 OnAbortXfer?.Invoke(this, abortXfer.XferID.ID);
10681 return true; 10664 return true;
10682 } 10665 }
10683 10666