aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-01-21 03:35:59 +0000
committerUbitUmarov2017-01-21 03:35:59 +0000
commitb20bd1a9dfdf9f7b7bb342f69832f7e7662ecaf2 (patch)
tree4cc907fd6e64090ba8ce7a80eac5c44143e8bab8 /OpenSim/Region
parentinitialize SimwideArea (diff)
downloadopensim-SC_OLD-b20bd1a9dfdf9f7b7bb342f69832f7e7662ecaf2.zip
opensim-SC_OLD-b20bd1a9dfdf9f7b7bb342f69832f7e7662ecaf2.tar.gz
opensim-SC_OLD-b20bd1a9dfdf9f7b7bb342f69832f7e7662ecaf2.tar.bz2
opensim-SC_OLD-b20bd1a9dfdf9f7b7bb342f69832f7e7662ecaf2.tar.xz
change the initialization point of SimwideArea
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs4
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 5d12f8b..66be5e5 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -287,8 +287,10 @@ namespace OpenSim.Region.CoreModules.World.Land
287 287
288 fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, 288 fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0,
289 (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY)); 289 (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY));
290 fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; 290 LandData ldata = fullSimParcel.LandData;
291 fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); 291 ldata.SimwideArea = ldata.Area;
292 ldata.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
293 ldata.ClaimDate = Util.UnixTimeSinceEpoch();
292 294
293 return AddLandObject(fullSimParcel); 295 return AddLandObject(fullSimParcel);
294 } 296 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index ae79849..3aca741 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -356,6 +356,7 @@ namespace OpenSim.Region.CoreModules.World.Land
356 } 356 }
357 } 357 }
358 358
359 // the total prims a parcel owner can have on a region
359 public int GetSimulatorMaxPrimCount() 360 public int GetSimulatorMaxPrimCount()
360 { 361 {
361 if (overrideSimulatorMaxPrimCount != null) 362 if (overrideSimulatorMaxPrimCount != null)
@@ -370,7 +371,7 @@ namespace OpenSim.Region.CoreModules.World.Land
370 * (double)m_scene.RegionInfo.RegionSettings.ObjectBonus 371 * (double)m_scene.RegionInfo.RegionSettings.ObjectBonus
371 / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) 372 / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY)
372 +0.5 ); 373 +0.5 );
373 374 // sanity check
374 if(simMax > m_scene.RegionInfo.ObjectCapacity) 375 if(simMax > m_scene.RegionInfo.ObjectCapacity)
375 simMax = m_scene.RegionInfo.ObjectCapacity; 376 simMax = m_scene.RegionInfo.ObjectCapacity;
376 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}", 377 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}",
@@ -1045,7 +1046,6 @@ namespace OpenSim.Region.CoreModules.World.Land
1045 1046
1046 tempArea *= landUnit * landUnit; 1047 tempArea *= landUnit * landUnit;
1047 LandData.Area = tempArea; 1048 LandData.Area = tempArea;
1048 LandData.SimwideArea = tempArea;
1049 } 1049 }
1050 1050
1051 #endregion 1051 #endregion