aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-01-21 00:30:42 +0000
committerUbitUmarov2017-01-21 00:30:42 +0000
commitd62854cbd317d0410bb814ca1182c9aad44cb9e6 (patch)
tree4c2e1551a7de6dbade7ae5fa9bc7441abb940625 /OpenSim/Framework/RegionInfo.cs
parentOops.. fix the null on the correct place.. jenkis may now fail for another re... (diff)
downloadopensim-SC_OLD-d62854cbd317d0410bb814ca1182c9aad44cb9e6.zip
opensim-SC_OLD-d62854cbd317d0410bb814ca1182c9aad44cb9e6.tar.gz
opensim-SC_OLD-d62854cbd317d0410bb814ca1182c9aad44cb9e6.tar.bz2
opensim-SC_OLD-d62854cbd317d0410bb814ca1182c9aad44cb9e6.tar.xz
set a sane default region ObjectCapacity
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 99e97e8..7de8c52 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Framework
130 private float m_physPrimMin = 0; 130 private float m_physPrimMin = 0;
131 private int m_physPrimMax = 0; 131 private int m_physPrimMax = 0;
132 private bool m_clampPrimSize = false; 132 private bool m_clampPrimSize = false;
133 private int m_objectCapacity = 0; 133 private int m_objectCapacity = 15000;
134 private int m_maxPrimsPerUser = -1; 134 private int m_maxPrimsPerUser = -1;
135 private int m_linksetCapacity = 0; 135 private int m_linksetCapacity = 0;
136 private string m_regionType = String.Empty; 136 private string m_regionType = String.Empty;
@@ -753,7 +753,7 @@ namespace OpenSim.Framework
753 m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); 753 m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
754 allKeys.Remove("ClampPrimSize"); 754 allKeys.Remove("ClampPrimSize");
755 755
756 m_objectCapacity = config.GetInt("MaxPrims", 15000); 756 m_objectCapacity = config.GetInt("MaxPrims", m_objectCapacity);
757 allKeys.Remove("MaxPrims"); 757 allKeys.Remove("MaxPrims");
758 758
759 m_maxPrimsPerUser = config.GetInt("MaxPrimsPerUser", -1); 759 m_maxPrimsPerUser = config.GetInt("MaxPrimsPerUser", -1);