diff options
| author | UbitUmarov | 2016-10-11 01:14:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-10-11 01:14:53 +0100 |
| commit | 7494d7726afd9f8b9762d78aead918ba7a90efa3 (patch) | |
| tree | ae8a219bc88bc833b8b7aeb30a146de4bad2ccfd /OpenSim/Region/OptionalModules | |
| parent | remove attachment to event OnPreAgentUpdate that is doing nothing (diff) | |
| download | opensim-SC_OLD-7494d7726afd9f8b9762d78aead918ba7a90efa3.zip opensim-SC_OLD-7494d7726afd9f8b9762d78aead918ba7a90efa3.tar.gz opensim-SC_OLD-7494d7726afd9f8b9762d78aead918ba7a90efa3.tar.bz2 opensim-SC_OLD-7494d7726afd9f8b9762d78aead918ba7a90efa3.tar.xz | |
change math on GetParcelMaxPrimCount and GetSimulatorMaxPrimCount to reduce round errors, limit both to region max prims. consider ObjectBonus on last one also. Change a variable name in PrimLimitsModule to make it more clear
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -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 | } |