aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-12 00:07:56 +0100
committerJustin Clark-Casey (justincc)2012-09-12 00:07:56 +0100
commit757d9163fa623b62f834e1684994d51f66428055 (patch)
tree718a48c936017847306b5d21f96a0b4a8b00cee7 /OpenSim/Framework
parentAdd levels 4 and 5 to "debug http" console command that will log a sample of ... (diff)
parentdocumentation (OnSceneObjectPartCopy) (diff)
downloadopensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.zip
opensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.tar.gz
opensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.tar.bz2
opensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs20
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8131089..ded2df2 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -126,6 +126,7 @@ namespace OpenSim.Framework
126 private int m_physPrimMax = 0; 126 private int m_physPrimMax = 0;
127 private bool m_clampPrimSize = false; 127 private bool m_clampPrimSize = false;
128 private int m_objectCapacity = 0; 128 private int m_objectCapacity = 0;
129 private int m_linksetCapacity = 0;
129 private int m_agentCapacity = 0; 130 private int m_agentCapacity = 0;
130 private string m_regionType = String.Empty; 131 private string m_regionType = String.Empty;
131 private RegionLightShareData m_windlight = new RegionLightShareData(); 132 private RegionLightShareData m_windlight = new RegionLightShareData();
@@ -317,6 +318,11 @@ namespace OpenSim.Framework
317 get { return m_objectCapacity; } 318 get { return m_objectCapacity; }
318 } 319 }
319 320
321 public int LinksetCapacity
322 {
323 get { return m_linksetCapacity; }
324 }
325
320 public int AgentCapacity 326 public int AgentCapacity
321 { 327 {
322 get { return m_agentCapacity; } 328 get { return m_agentCapacity; }
@@ -654,6 +660,9 @@ namespace OpenSim.Framework
654 660
655 m_objectCapacity = config.GetInt("MaxPrims", 15000); 661 m_objectCapacity = config.GetInt("MaxPrims", 15000);
656 allKeys.Remove("MaxPrims"); 662 allKeys.Remove("MaxPrims");
663
664 m_linksetCapacity = config.GetInt("LinksetPrims", 0);
665 allKeys.Remove("LinksetPrims");
657 666
658 #endregion 667 #endregion
659 668
@@ -709,6 +718,9 @@ namespace OpenSim.Framework
709 if (m_objectCapacity != 0) 718 if (m_objectCapacity != 0)
710 config.Set("MaxPrims", m_objectCapacity); 719 config.Set("MaxPrims", m_objectCapacity);
711 720
721 if (m_linksetCapacity != 0)
722 config.Set("LinksetPrims", m_linksetCapacity);
723
712 if (m_agentCapacity != 0) 724 if (m_agentCapacity != 0)
713 config.Set("MaxAgents", m_agentCapacity); 725 config.Set("MaxAgents", m_agentCapacity);
714 726
@@ -804,6 +816,9 @@ namespace OpenSim.Framework
804 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 816 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
805 "Max objects this sim will hold", m_objectCapacity.ToString(), true); 817 "Max objects this sim will hold", m_objectCapacity.ToString(), true);
806 818
819 configMember.addConfigurationOption("linkset_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
820 "Max prims an object will hold", m_linksetCapacity.ToString(), true);
821
807 configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 822 configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
808 "Max avatars this sim will hold", m_agentCapacity.ToString(), true); 823 "Max avatars this sim will hold", m_agentCapacity.ToString(), true);
809 824
@@ -922,6 +937,9 @@ namespace OpenSim.Framework
922 case "object_capacity": 937 case "object_capacity":
923 m_objectCapacity = (int)configuration_result; 938 m_objectCapacity = (int)configuration_result;
924 break; 939 break;
940 case "linkset_capacity":
941 m_linksetCapacity = (int)configuration_result;
942 break;
925 case "agent_capacity": 943 case "agent_capacity":
926 m_agentCapacity = (int)configuration_result; 944 m_agentCapacity = (int)configuration_result;
927 break; 945 break;
@@ -1052,4 +1070,4 @@ namespace OpenSim.Framework
1052 return kvp; 1070 return kvp;
1053 } 1071 }
1054 } 1072 }
1055} \ No newline at end of file 1073}