From 466657375ab944e3d8d246dc3a80de3ddbe3887e Mon Sep 17 00:00:00 2001 From: Kevin Cozens Date: Thu, 30 Oct 2014 17:43:42 -0400 Subject: 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. --- OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { string response = null; - int simulatorCapacity = lo.GetParcelMaxPrimCount(); + int simulatorCapacity = lo.GetSimulatorMaxPrimCount(); if ((objectCount + lo.PrimCounts.Total) > simulatorCapacity) { response = "Unable to rez object because the parcel is too full"; -- cgit v1.1