diff options
| author | UbitUmarov | 2018-11-08 21:52:16 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-11-08 21:52:16 +0000 |
| commit | 492b9e3326dba27a2e77f6ad0ab9e56a0b08d741 (patch) | |
| tree | 6a7b11ff5ba94fdcc128c3133d00cb223685e9a3 /OpenSim/Region | |
| parent | fix unknown priority scheme setting error. Thx Ai Austin (diff) | |
| download | opensim-SC-492b9e3326dba27a2e77f6ad0ab9e56a0b08d741.zip opensim-SC-492b9e3326dba27a2e77f6ad0ab9e56a0b08d741.tar.gz opensim-SC-492b9e3326dba27a2e77f6ad0ab9e56a0b08d741.tar.bz2 opensim-SC-492b9e3326dba27a2e77f6ad0ab9e56a0b08d741.tar.xz | |
mantis 8035: fix number of prims use to be from all owned parcels
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs index 61b6d68..58ed16b 100644 --- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs +++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |||
| @@ -107,7 +107,6 @@ namespace OpenSim.Region.OptionalModules | |||
| 107 | 107 | ||
| 108 | private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition) | 108 | private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition) |
| 109 | { | 109 | { |
| 110 | |||
| 111 | ILandObject lo = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); | 110 | ILandObject lo = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); |
| 112 | 111 | ||
| 113 | string response = DoCommonChecks(objectCount, ownerID, lo); | 112 | string response = DoCommonChecks(objectCount, ownerID, lo); |
| @@ -200,7 +199,7 @@ namespace OpenSim.Region.OptionalModules | |||
| 200 | string response = null; | 199 | string response = null; |
| 201 | 200 | ||
| 202 | int OwnedParcelsCapacity = lo.GetSimulatorMaxPrimCount(); | 201 | int OwnedParcelsCapacity = lo.GetSimulatorMaxPrimCount(); |
| 203 | if ((objectCount + lo.PrimCounts.Total) > OwnedParcelsCapacity) | 202 | if ((objectCount + lo.PrimCounts.Simulator) > OwnedParcelsCapacity) |
| 204 | { | 203 | { |
| 205 | response = "Unable to rez object because the parcel is full"; | 204 | response = "Unable to rez object because the parcel is full"; |
| 206 | } | 205 | } |