diff options
author | SignpostMarv | 2012-09-08 13:48:07 +0100 |
---|---|---|
committer | Melanie | 2012-09-09 12:59:25 +0100 |
commit | 783ee949ea9b9bfe309e542a74bb0712f3b65d00 (patch) | |
tree | 70685f5c85fa08f5f0d58eefd3ca7133ac0ba1c3 /OpenSim/Framework | |
parent | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note... (diff) | |
download | opensim-SC-783ee949ea9b9bfe309e542a74bb0712f3b65d00.zip opensim-SC-783ee949ea9b9bfe309e542a74bb0712f3b65d00.tar.gz opensim-SC-783ee949ea9b9bfe309e542a74bb0712f3b65d00.tar.bz2 opensim-SC-783ee949ea9b9bfe309e542a74bb0712f3b65d00.tar.xz |
implementing per-region configuration of limits on the number of prims one can have in a linkset
Applied with changes - patch was based on a repo different from core
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 20 |
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 | } |