diff options
author | mingchen | 2008-06-11 17:31:43 +0000 |
---|---|---|
committer | mingchen | 2008-06-11 17:31:43 +0000 |
commit | 0896cb53d4bb9ffb4492a1a5dfdc2749d9117abb (patch) | |
tree | 644718e985b16ae25ea9b1779444ebf80c64ceb9 /OpenSim/Region/ClientStack/LindenUDP | |
parent | Mantis#1514. Thank you kindly, Boscata for an InventoryServer patch (diff) | |
download | opensim-SC_OLD-0896cb53d4bb9ffb4492a1a5dfdc2749d9117abb.zip opensim-SC_OLD-0896cb53d4bb9ffb4492a1a5dfdc2749d9117abb.tar.gz opensim-SC_OLD-0896cb53d4bb9ffb4492a1a5dfdc2749d9117abb.tar.bz2 opensim-SC_OLD-0896cb53d4bb9ffb4492a1a5dfdc2749d9117abb.tar.xz |
*Parcel Prim Count Maximums moved to their own functions so modules can override the default method of calculating how many prims a parcel can have.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 6839896..47a9f53 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2630,7 +2630,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2630 | this.OutPacket(packet, ThrottleOutPacketType.Task); | 2630 | this.OutPacket(packet, ThrottleOutPacketType.Task); |
2631 | } | 2631 | } |
2632 | 2632 | ||
2633 | public void sendLandProperties(IClientAPI remote_client,int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int simObjectCapacity, uint regionFlags) | 2633 | public void sendLandProperties(IClientAPI remote_client,int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
2634 | { | 2634 | { |
2635 | ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties); | 2635 | ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties); |
2636 | // TODO: don't create new blocks if recycling an old packet | 2636 | // TODO: don't create new blocks if recycling an old packet |
@@ -2654,10 +2654,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2654 | updatePacket.ParcelData.LocalID = landData.localID; | 2654 | updatePacket.ParcelData.LocalID = landData.localID; |
2655 | if (landData.area > 0) | 2655 | if (landData.area > 0) |
2656 | { | 2656 | { |
2657 | updatePacket.ParcelData.MaxPrims = | 2657 | updatePacket.ParcelData.MaxPrims = parcelObjectCapacity; |
2658 | Convert.ToInt32( | ||
2659 | Math.Round((Convert.ToDecimal(landData.area) / Convert.ToDecimal(65536)) * simObjectCapacity * | ||
2660 | Convert.ToDecimal(simObjectBonusFactor))); | ||
2661 | } | 2658 | } |
2662 | else | 2659 | else |
2663 | { | 2660 | { |
@@ -2696,10 +2693,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2696 | updatePacket.ParcelData.SequenceID = sequence_id; | 2693 | updatePacket.ParcelData.SequenceID = sequence_id; |
2697 | if (landData.simwideArea > 0) | 2694 | if (landData.simwideArea > 0) |
2698 | { | 2695 | { |
2699 | updatePacket.ParcelData.SimWideMaxPrims = | 2696 | updatePacket.ParcelData.SimWideMaxPrims = parcelObjectCapacity; |
2700 | Convert.ToInt32( | ||
2701 | Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * simObjectCapacity * | ||
2702 | Convert.ToDecimal(simObjectBonusFactor))); | ||
2703 | } | 2697 | } |
2704 | else | 2698 | else |
2705 | { | 2699 | { |