diff options
| author | Kevin Cozens | 2014-10-30 17:43:42 -0400 |
|---|---|---|
| committer | Kevin Cozens | 2014-10-30 18:05:16 -0400 |
| commit | 466657375ab944e3d8d246dc3a80de3ddbe3887e (patch) | |
| tree | bf1dce79eda615246f32ec88b2df61a60a223cc4 /OpenSim/Region | |
| parent | Use parcel prim limit (not region limit) when checking if area is full. (diff) | |
| download | opensim-SC-466657375ab944e3d8d246dc3a80de3ddbe3887e.zip opensim-SC-466657375ab944e3d8d246dc3a80de3ddbe3887e.tar.gz opensim-SC-466657375ab944e3d8d246dc3a80de3ddbe3887e.tar.bz2 opensim-SC-466657375ab944e3d8d246dc3a80de3ddbe3887e.tar.xz | |
Revert my commit that fixed unexpected behaviour re: parcel prim limits.
Others think different about how limits work so another solution is needed.
This reverts commit ff62b90636e13e531b95bbb7699b130909fc70f2.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs index b18ea9d..395bbf1 100644 --- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs +++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |||
| @@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules | |||
| 176 | { | 176 | { |
| 177 | string response = null; | 177 | string response = null; |
| 178 | 178 | ||
| 179 | int simulatorCapacity = lo.GetParcelMaxPrimCount(); | 179 | int simulatorCapacity = lo.GetSimulatorMaxPrimCount(); |
| 180 | if ((objectCount + lo.PrimCounts.Total) > simulatorCapacity) | 180 | if ((objectCount + lo.PrimCounts.Total) > simulatorCapacity) |
| 181 | { | 181 | { |
| 182 | response = "Unable to rez object because the parcel is too full"; | 182 | response = "Unable to rez object because the parcel is too full"; |