gistfile1.txt

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 4169152..eb56d8d 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -747,6 +747,15 @@ namespace OpenSim.Framework
             AgentCapacity = config.GetInt("MaxAgents", 100);
             allKeys.Remove("MaxAgents");
 
+            if (config.Contains("AgentLimit"))
+            {
+                int agentLimit = config.GetInt("AgentLimit");
+                agentLimit = Math.Max(agentLimit, 0);
+                agentLimit = Math.Min(agentLimit, AgentCapacity);
+                RegionSettings.AgentLimit = agentLimit;
+                allKeys.Remove("AgentLimit");
+            }           
+
             // Multi-tenancy
             //
             ScopeID = new UUID(config.GetString("ScopeID", UUID.Zero.ToString()));