aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/ParcelManager.cs
diff options
context:
space:
mode:
authormingchen2007-07-14 17:01:15 +0000
committermingchen2007-07-14 17:01:15 +0000
commitbf32020693b62685bc15f2e56cd2b717f4e170a7 (patch)
tree80256e8f0217533ecfd4aa6fa7f44e7c3ac49ed5 /OpenSim/Region/Environment/ParcelManager.cs
parent* SimpleApp finally doing something fun. :) (diff)
downloadopensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.zip
opensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.tar.gz
opensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.tar.bz2
opensim-SC_OLD-bf32020693b62685bc15f2e56cd2b717f4e170a7.tar.xz
*Removed ParcelManager from SceneObject and Primitive and replaced with events in EventManager
*Prim count and sim-wide prim count correctly reflect object bonus multiplier
Diffstat (limited to 'OpenSim/Region/Environment/ParcelManager.cs')
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 28bfd4c..3603caa 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -683,7 +683,14 @@ namespace OpenSim.Region.Environment
683 updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned; 683 updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
684 updatePacket.ParcelData.LandingType = (byte)parcelData.landingType; 684 updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
685 updatePacket.ParcelData.LocalID = parcelData.localID; 685 updatePacket.ParcelData.LocalID = parcelData.localID;
686 updatePacket.ParcelData.MaxPrims = 1000; //unemplemented 686 if (parcelData.area > 0)
687 {
688 updatePacket.ParcelData.MaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(parcelData.area) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_world.RegionInfo.estateSettings.objectBonusFactor)));
689 }
690 else
691 {
692 updatePacket.ParcelData.MaxPrims = 0;
693 }
687 updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale; 694 updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
688 updatePacket.ParcelData.MediaID = parcelData.mediaID; 695 updatePacket.ParcelData.MediaID = parcelData.mediaID;
689 updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL); 696 updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
@@ -711,7 +718,7 @@ namespace OpenSim.Region.Environment
711 updatePacket.ParcelData.SequenceID = sequence_id; 718 updatePacket.ParcelData.SequenceID = sequence_id;
712 if (parcelData.simwideArea > 0) 719 if (parcelData.simwideArea > 0)
713 { 720 {
714 updatePacket.ParcelData.SimWideMaxPrims = Convert.ToInt32(Math.Floor((Convert.ToDecimal(65536) / Convert.ToDecimal(parcelData.simwideArea)) * 15000)); 721 updatePacket.ParcelData.SimWideMaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(parcelData.simwideArea) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_world.RegionInfo.estateSettings.objectBonusFactor)));
715 } 722 }
716 else 723 else
717 { 724 {