Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 4 insertions, 8 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 5911ade..cae5e51 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -127,7 +127,6 @@ namespace OpenSim.Framework
         private int m_objectCapacity = 0;
         private int m_maxPrimsPerUser = -1;
         private int m_linksetCapacity = 0;
-        private int m_agentCapacity = 0;
         private string m_regionType = String.Empty;
         private RegionLightShareData m_windlight = new RegionLightShareData();
         protected uint m_httpPort;
@@ -351,10 +350,7 @@ namespace OpenSim.Framework
             get { return m_linksetCapacity; }
         }
 
-        public int AgentCapacity
-        {
-            get { return m_agentCapacity; }
-        }
+        public int AgentCapacity { get; set; }
 
         public byte AccessLevel
         {
@@ -748,7 +744,7 @@ namespace OpenSim.Framework
             
             #endregion
 
-            m_agentCapacity = config.GetInt("MaxAgents", 100);
+            AgentCapacity = config.GetInt("MaxAgents", 100);
             allKeys.Remove("MaxAgents");
 
             // Multi-tenancy
@@ -864,8 +860,8 @@ namespace OpenSim.Framework
             if (m_linksetCapacity > 0)
                 config.Set("LinksetPrims", m_linksetCapacity);
 
-            if (m_agentCapacity > 0)
-                config.Set("MaxAgents", m_agentCapacity);
+            if (AgentCapacity > 0)
+                config.Set("MaxAgents", AgentCapacity);
 
             if (ScopeID != UUID.Zero)
                 config.Set("ScopeID", ScopeID.ToString());