aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-10-31 21:44:31 +0000
committerJustin Clark-Casey2014-10-31 21:47:12 +0000
commita05be7bd651fb48b522af1ee94e0aa602ceb480a (patch)
tree20b43829f2875d4ce64b0a053fc727f8f6f09738 /OpenSim/Framework/RegionInfo.cs
parentAdd "region get" command as a synononym for "show region" console command. (diff)
downloadopensim-SC-a05be7bd651fb48b522af1ee94e0aa602ceb480a.zip
opensim-SC-a05be7bd651fb48b522af1ee94e0aa602ceb480a.tar.gz
opensim-SC-a05be7bd651fb48b522af1ee94e0aa602ceb480a.tar.bz2
opensim-SC-a05be7bd651fb48b522af1ee94e0aa602ceb480a.tar.xz
Add "region set" console command.
This current allows one to set two region parameters agent-limit <int> will set the current root agent limit for the region, as also settable through the viewer, though some impose a max setting (e.g. 100). max-agent-limit <int> will set the maximum allowed root agent limit. This can also be set via the MaxAgent parameter in region config.
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs12
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
127 private int m_objectCapacity = 0; 127 private int m_objectCapacity = 0;
128 private int m_maxPrimsPerUser = -1; 128 private int m_maxPrimsPerUser = -1;
129 private int m_linksetCapacity = 0; 129 private int m_linksetCapacity = 0;
130 private int m_agentCapacity = 0;
131 private string m_regionType = String.Empty; 130 private string m_regionType = String.Empty;
132 private RegionLightShareData m_windlight = new RegionLightShareData(); 131 private RegionLightShareData m_windlight = new RegionLightShareData();
133 protected uint m_httpPort; 132 protected uint m_httpPort;
@@ -351,10 +350,7 @@ namespace OpenSim.Framework
351 get { return m_linksetCapacity; } 350 get { return m_linksetCapacity; }
352 } 351 }
353 352
354 public int AgentCapacity 353 public int AgentCapacity { get; set; }
355 {
356 get { return m_agentCapacity; }
357 }
358 354
359 public byte AccessLevel 355 public byte AccessLevel
360 { 356 {
@@ -748,7 +744,7 @@ namespace OpenSim.Framework
748 744
749 #endregion 745 #endregion
750 746
751 m_agentCapacity = config.GetInt("MaxAgents", 100); 747 AgentCapacity = config.GetInt("MaxAgents", 100);
752 allKeys.Remove("MaxAgents"); 748 allKeys.Remove("MaxAgents");
753 749
754 // Multi-tenancy 750 // Multi-tenancy
@@ -864,8 +860,8 @@ namespace OpenSim.Framework
864 if (m_linksetCapacity > 0) 860 if (m_linksetCapacity > 0)
865 config.Set("LinksetPrims", m_linksetCapacity); 861 config.Set("LinksetPrims", m_linksetCapacity);
866 862
867 if (m_agentCapacity > 0) 863 if (AgentCapacity > 0)
868 config.Set("MaxAgents", m_agentCapacity); 864 config.Set("MaxAgents", AgentCapacity);
869 865
870 if (ScopeID != UUID.Zero) 866 if (ScopeID != UUID.Zero)
871 config.Set("ScopeID", ScopeID.ToString()); 867 config.Set("ScopeID", ScopeID.ToString());