aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorKevin Cozens2014-10-30 11:19:56 -0400
committerKevin Cozens2014-10-30 11:21:27 -0400
commitff62b90636e13e531b95bbb7699b130909fc70f2 (patch)
tree97d5d81c8b7317cb36d89fb23c8681a904a41dd1 /OpenSim/Region
parentAdd hypergrid teleporting support to user profiles picks (diff)
downloadopensim-SC_OLD-ff62b90636e13e531b95bbb7699b130909fc70f2.zip
opensim-SC_OLD-ff62b90636e13e531b95bbb7699b130909fc70f2.tar.gz
opensim-SC_OLD-ff62b90636e13e531b95bbb7699b130909fc70f2.tar.bz2
opensim-SC_OLD-ff62b90636e13e531b95bbb7699b130909fc70f2.tar.xz
Use parcel prim limit (not region limit) when checking if area is full.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 395bbf1..b18ea9d 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.GetSimulatorMaxPrimCount(); 179 int simulatorCapacity = lo.GetParcelMaxPrimCount();
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";