diff options
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 60 |
1 files changed, 58 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 4bde7be..da87b05 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -122,10 +122,13 @@ namespace OpenSim.Framework | |||
122 | public UUID lastMapUUID = UUID.Zero; | 122 | public UUID lastMapUUID = UUID.Zero; |
123 | public string lastMapRefresh = "0"; | 123 | public string lastMapRefresh = "0"; |
124 | 124 | ||
125 | private float m_nonphysPrimMin = 0; | ||
125 | private int m_nonphysPrimMax = 0; | 126 | private int m_nonphysPrimMax = 0; |
127 | private float m_physPrimMin = 0; | ||
126 | private int m_physPrimMax = 0; | 128 | private int m_physPrimMax = 0; |
127 | private bool m_clampPrimSize = false; | 129 | private bool m_clampPrimSize = false; |
128 | private int m_objectCapacity = 0; | 130 | private int m_objectCapacity = 0; |
131 | private int m_linksetCapacity = 0; | ||
129 | private int m_agentCapacity = 0; | 132 | private int m_agentCapacity = 0; |
130 | private string m_regionType = String.Empty; | 133 | private string m_regionType = String.Empty; |
131 | private RegionLightShareData m_windlight = new RegionLightShareData(); | 134 | private RegionLightShareData m_windlight = new RegionLightShareData(); |
@@ -287,11 +290,21 @@ namespace OpenSim.Framework | |||
287 | set { m_windlight = value; } | 290 | set { m_windlight = value; } |
288 | } | 291 | } |
289 | 292 | ||
293 | public float NonphysPrimMin | ||
294 | { | ||
295 | get { return m_nonphysPrimMin; } | ||
296 | } | ||
297 | |||
290 | public int NonphysPrimMax | 298 | public int NonphysPrimMax |
291 | { | 299 | { |
292 | get { return m_nonphysPrimMax; } | 300 | get { return m_nonphysPrimMax; } |
293 | } | 301 | } |
294 | 302 | ||
303 | public float PhysPrimMin | ||
304 | { | ||
305 | get { return m_physPrimMin; } | ||
306 | } | ||
307 | |||
295 | public int PhysPrimMax | 308 | public int PhysPrimMax |
296 | { | 309 | { |
297 | get { return m_physPrimMax; } | 310 | get { return m_physPrimMax; } |
@@ -307,6 +320,11 @@ namespace OpenSim.Framework | |||
307 | get { return m_objectCapacity; } | 320 | get { return m_objectCapacity; } |
308 | } | 321 | } |
309 | 322 | ||
323 | public int LinksetCapacity | ||
324 | { | ||
325 | get { return m_linksetCapacity; } | ||
326 | } | ||
327 | |||
310 | public int AgentCapacity | 328 | public int AgentCapacity |
311 | { | 329 | { |
312 | get { return m_agentCapacity; } | 330 | get { return m_agentCapacity; } |
@@ -625,16 +643,31 @@ namespace OpenSim.Framework | |||
625 | m_regionType = config.GetString("RegionType", String.Empty); | 643 | m_regionType = config.GetString("RegionType", String.Empty); |
626 | allKeys.Remove("RegionType"); | 644 | allKeys.Remove("RegionType"); |
627 | 645 | ||
628 | // Prim stuff | 646 | #region Prim stuff |
629 | // | 647 | |
648 | m_nonphysPrimMin = config.GetFloat("NonphysicalPrimMin", 0); | ||
649 | allKeys.Remove("NonphysicalPrimMin"); | ||
650 | |||
630 | m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0); | 651 | m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0); |
631 | allKeys.Remove("NonphysicalPrimMax"); | 652 | allKeys.Remove("NonphysicalPrimMax"); |
653 | |||
654 | m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0); | ||
655 | allKeys.Remove("PhysicalPrimMin"); | ||
656 | |||
632 | m_physPrimMax = config.GetInt("PhysicalPrimMax", 0); | 657 | m_physPrimMax = config.GetInt("PhysicalPrimMax", 0); |
633 | allKeys.Remove("PhysicalPrimMax"); | 658 | allKeys.Remove("PhysicalPrimMax"); |
659 | |||
634 | m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); | 660 | m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); |
635 | allKeys.Remove("ClampPrimSize"); | 661 | allKeys.Remove("ClampPrimSize"); |
662 | |||
636 | m_objectCapacity = config.GetInt("MaxPrims", 15000); | 663 | m_objectCapacity = config.GetInt("MaxPrims", 15000); |
637 | allKeys.Remove("MaxPrims"); | 664 | allKeys.Remove("MaxPrims"); |
665 | |||
666 | m_linksetCapacity = config.GetInt("LinksetPrims", 0); | ||
667 | allKeys.Remove("LinksetPrims"); | ||
668 | |||
669 | #endregion | ||
670 | |||
638 | m_agentCapacity = config.GetInt("MaxAgents", 100); | 671 | m_agentCapacity = config.GetInt("MaxAgents", 100); |
639 | allKeys.Remove("MaxAgents"); | 672 | allKeys.Remove("MaxAgents"); |
640 | 673 | ||
@@ -673,15 +706,26 @@ namespace OpenSim.Framework | |||
673 | 706 | ||
674 | config.Set("ExternalHostName", m_externalHostName); | 707 | config.Set("ExternalHostName", m_externalHostName); |
675 | 708 | ||
709 | if (m_nonphysPrimMin != 0) | ||
710 | config.Set("NonphysicalPrimMax", m_nonphysPrimMin); | ||
711 | |||
676 | if (m_nonphysPrimMax != 0) | 712 | if (m_nonphysPrimMax != 0) |
677 | config.Set("NonphysicalPrimMax", m_nonphysPrimMax); | 713 | config.Set("NonphysicalPrimMax", m_nonphysPrimMax); |
714 | |||
715 | if (m_physPrimMin != 0) | ||
716 | config.Set("PhysicalPrimMax", m_physPrimMin); | ||
717 | |||
678 | if (m_physPrimMax != 0) | 718 | if (m_physPrimMax != 0) |
679 | config.Set("PhysicalPrimMax", m_physPrimMax); | 719 | config.Set("PhysicalPrimMax", m_physPrimMax); |
720 | |||
680 | config.Set("ClampPrimSize", m_clampPrimSize.ToString()); | 721 | config.Set("ClampPrimSize", m_clampPrimSize.ToString()); |
681 | 722 | ||
682 | if (m_objectCapacity != 0) | 723 | if (m_objectCapacity != 0) |
683 | config.Set("MaxPrims", m_objectCapacity); | 724 | config.Set("MaxPrims", m_objectCapacity); |
684 | 725 | ||
726 | if (m_linksetCapacity != 0) | ||
727 | config.Set("LinksetPrims", m_linksetCapacity); | ||
728 | |||
685 | if (m_agentCapacity != 0) | 729 | if (m_agentCapacity != 0) |
686 | config.Set("MaxAgents", m_agentCapacity); | 730 | config.Set("MaxAgents", m_agentCapacity); |
687 | 731 | ||
@@ -759,9 +803,15 @@ namespace OpenSim.Framework | |||
759 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 803 | configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
760 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); | 804 | "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); |
761 | 805 | ||
806 | configMember.addConfigurationOption("nonphysical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | ||
807 | "Minimum size for nonphysical prims", m_nonphysPrimMin.ToString(), true); | ||
808 | |||
762 | configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 809 | configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
763 | "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true); | 810 | "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true); |
764 | 811 | ||
812 | configMember.addConfigurationOption("physical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | ||
813 | "Minimum size for nonphysical prims", m_physPrimMin.ToString(), true); | ||
814 | |||
765 | configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 815 | configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
766 | "Maximum size for physical prims", m_physPrimMax.ToString(), true); | 816 | "Maximum size for physical prims", m_physPrimMax.ToString(), true); |
767 | 817 | ||
@@ -771,6 +821,9 @@ namespace OpenSim.Framework | |||
771 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 821 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
772 | "Max objects this sim will hold", m_objectCapacity.ToString(), true); | 822 | "Max objects this sim will hold", m_objectCapacity.ToString(), true); |
773 | 823 | ||
824 | configMember.addConfigurationOption("linkset_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | ||
825 | "Max prims an object will hold", m_linksetCapacity.ToString(), true); | ||
826 | |||
774 | configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 827 | configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
775 | "Max avatars this sim will hold", m_agentCapacity.ToString(), true); | 828 | "Max avatars this sim will hold", m_agentCapacity.ToString(), true); |
776 | 829 | ||
@@ -892,6 +945,9 @@ namespace OpenSim.Framework | |||
892 | case "object_capacity": | 945 | case "object_capacity": |
893 | m_objectCapacity = (int)configuration_result; | 946 | m_objectCapacity = (int)configuration_result; |
894 | break; | 947 | break; |
948 | case "linkset_capacity": | ||
949 | m_linksetCapacity = (int)configuration_result; | ||
950 | break; | ||
895 | case "agent_capacity": | 951 | case "agent_capacity": |
896 | m_agentCapacity = (int)configuration_result; | 952 | m_agentCapacity = (int)configuration_result; |
897 | break; | 953 | break; |