diff options
| author | UbitUmarov | 2017-04-25 17:59:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-25 17:59:53 +0100 |
| commit | a680d8b8d700f78beb1a9eea98b52d59118efe2e (patch) | |
| tree | dd084e74fb61400c704a14dcfa8689670acb9ec2 /OpenSim/Framework/RegionInfo.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff) | |
| download | opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2 opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 4 |
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); |