ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.7.3-post-fixes

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2012-02-06 20:54:21 +00:00
parent 1a14e660d2 130b1c0665
commit 8a36f54cf4
8 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/RegionInfo.cs
View File

@@ -607,9 +607,9 @@ namespace OpenSim.Framework
// Prim stuff
//
m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256);
m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
allKeys.Remove("NonphysicalPrimMax");
m_physPrimMax = config.GetInt("PhysicalPrimMax", 10);
m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
allKeys.Remove("PhysicalPrimMax");
m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
allKeys.Remove("ClampPrimSize");