diff options
author | Teravus Ovares | 2007-12-30 06:18:17 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-30 06:18:17 +0000 |
commit | 32438ab1b9a5c270e0a4a2d708f8c7730dc7e617 (patch) | |
tree | 21595ce38d7a9474c1b3f3eb71c8d50a2763039a /OpenSim/Region/Environment/LandManagement | |
parent | * Applied Melanie's same instance IM fix. This will make IMs work within the... (diff) | |
download | opensim-SC_OLD-32438ab1b9a5c270e0a4a2d708f8c7730dc7e617.zip opensim-SC_OLD-32438ab1b9a5c270e0a4a2d708f8c7730dc7e617.tar.gz opensim-SC_OLD-32438ab1b9a5c270e0a4a2d708f8c7730dc7e617.tar.bz2 opensim-SC_OLD-32438ab1b9a5c270e0a4a2d708f8c7730dc7e617.tar.xz |
* This update rolls back the packetpool and LibSL changes. Please retest and then patch these changes back in. Currently it's not quite ready for 0.5. The down side to this action, is that we loose some performance to the garbage collector for now. Given that the target date for 0.5 is *Two days* from now, I'm taking the initiative to work towards a real stable version.
* This update also fixes scripting and some weird physics reactions
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/Land.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/LandManager.cs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs index 5c99ffd..bd26fdf 100644 --- a/OpenSim/Region/Environment/LandManagement/Land.cs +++ b/OpenSim/Region/Environment/LandManagement/Land.cs | |||
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
111 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, | 111 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, |
112 | IClientAPI remote_client) | 112 | IClientAPI remote_client) |
113 | { | 113 | { |
114 | ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties); | 114 | ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket(); |
115 | // TODO: don't create new blocks if recycling an old packet | 115 | // TODO: don't create new blocks if recycling an old packet |
116 | 116 | ||
117 | updatePacket.ParcelData.AABBMax = landData.AABBMax; | 117 | updatePacket.ParcelData.AABBMax = landData.AABBMax; |
@@ -337,7 +337,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
337 | 337 | ||
338 | if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both) | 338 | if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both) |
339 | { | 339 | { |
340 | replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); | 340 | replyPacket = new ParcelAccessListReplyPacket(); |
341 | replyPacket.Data.AgentID = agentID; | 341 | replyPacket.Data.AgentID = agentID; |
342 | replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Access; | 342 | replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Access; |
343 | replyPacket.Data.LocalID = landData.localID; | 343 | replyPacket.Data.LocalID = landData.localID; |
@@ -349,7 +349,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
349 | 349 | ||
350 | if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) | 350 | if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) |
351 | { | 351 | { |
352 | replyPacket = (ParcelAccessListReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); | 352 | replyPacket = new ParcelAccessListReplyPacket(); |
353 | replyPacket.Data.AgentID = agentID; | 353 | replyPacket.Data.AgentID = agentID; |
354 | replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Ban; | 354 | replyPacket.Data.Flags = (uint) ParcelManager.AccessList.Ban; |
355 | replyPacket.Data.LocalID = landData.localID; | 355 | replyPacket.Data.LocalID = landData.localID; |
@@ -660,7 +660,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
660 | 660 | ||
661 | bool firstCall = true; | 661 | bool firstCall = true; |
662 | int MAX_OBJECTS_PER_PACKET = 251; | 662 | int MAX_OBJECTS_PER_PACKET = 251; |
663 | ForceObjectSelectPacket pack = (ForceObjectSelectPacket) PacketPool.Instance.GetPacket(PacketType.ForceObjectSelect); | 663 | ForceObjectSelectPacket pack = new ForceObjectSelectPacket(); |
664 | // TODO: don't create new blocks if recycling an old packet | 664 | // TODO: don't create new blocks if recycling an old packet |
665 | ForceObjectSelectPacket.DataBlock[] data; | 665 | ForceObjectSelectPacket.DataBlock[] data; |
666 | while (resultLocalIDs.Count > 0) | 666 | while (resultLocalIDs.Count > 0) |
@@ -699,7 +699,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
699 | public void sendLandObjectOwners(IClientAPI remote_client) | 699 | public void sendLandObjectOwners(IClientAPI remote_client) |
700 | { | 700 | { |
701 | Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>(); | 701 | Dictionary<LLUUID, int> ownersAndCount = new Dictionary<LLUUID, int>(); |
702 | ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket) PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); | 702 | ParcelObjectOwnersReplyPacket pack = new ParcelObjectOwnersReplyPacket(); |
703 | // TODO: don't create new blocks if recycling an old packet | 703 | // TODO: don't create new blocks if recycling an old packet |
704 | 704 | ||
705 | foreach (SceneObjectGroup obj in primsOverMe) | 705 | foreach (SceneObjectGroup obj in primsOverMe) |
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index 22e7fc9..d463964 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs | |||
@@ -494,7 +494,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
494 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) | 494 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) |
495 | { | 495 | { |
496 | byteArrayCount = 0; | 496 | byteArrayCount = 0; |
497 | packet = (ParcelOverlayPacket) PacketPool.Instance.GetPacket(PacketType.ParcelOverlay); | 497 | packet = new ParcelOverlayPacket(); |
498 | packet.ParcelData.Data = byteArray; | 498 | packet.ParcelData.Data = byteArray; |
499 | packet.ParcelData.SequenceID = sequenceID; | 499 | packet.ParcelData.SequenceID = sequenceID; |
500 | remote_client.OutPacket((Packet) packet, ThrottleOutPacketType.Task); | 500 | remote_client.OutPacket((Packet) packet, ThrottleOutPacketType.Task); |