diff options
| author | UbitUmarov | 2016-10-11 02:16:16 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-10-11 02:16:16 +0100 |
| commit | 085965b86cdb24e5a7d32a93b588211cd414cc23 (patch) | |
| tree | af044d4a509ed0a3c80118e15907014d275c5938 /OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |
| parent | change some coments relative to ssl in config files (diff) | |
| parent | change math on GetParcelMaxPrimCount and GetSimulatorMaxPrimCount to reduce ... (diff) | |
| download | opensim-SC-085965b86cdb24e5a7d32a93b588211cd414cc23.zip opensim-SC-085965b86cdb24e5a7d32a93b588211cd414cc23.tar.gz opensim-SC-085965b86cdb24e5a7d32a93b588211cd414cc23.tar.bz2 opensim-SC-085965b86cdb24e5a7d32a93b588211cd414cc23.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs index 50a5fae..4ffb03b 100644 --- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs +++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |||
| @@ -186,8 +186,8 @@ namespace OpenSim.Region.OptionalModules | |||
| 186 | { | 186 | { |
| 187 | string response = null; | 187 | string response = null; |
| 188 | 188 | ||
| 189 | int simulatorCapacity = lo.GetSimulatorMaxPrimCount(); | 189 | int OwnedParcelsCapacity = lo.GetSimulatorMaxPrimCount(); |
| 190 | if ((objectCount + lo.PrimCounts.Total) > simulatorCapacity) | 190 | if ((objectCount + lo.PrimCounts.Total) > OwnedParcelsCapacity) |
| 191 | { | 191 | { |
| 192 | response = "Unable to rez object because the parcel is too full"; | 192 | response = "Unable to rez object because the parcel is too full"; |
| 193 | } | 193 | } |