diff options
| author | Justin Clark-Casey (justincc) | 2012-02-06 20:54:21 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-06 20:54:21 +0000 |
| commit | 8a36f54cf41ae3c1809f34dfee4c60058605aa20 (patch) | |
| tree | c05781596c843dae2d6fd670b72628a466df9014 /OpenSim/Framework | |
| parent | Merge branch 'master' into 0.7.3-post-fixes (diff) | |
| parent | Revert my two quick fixes for the lag issue and put in the real fix, which (diff) | |
| download | opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.zip opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.gz opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.bz2 opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Framework')
| -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 e2664dd..661b457 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -607,9 +607,9 @@ namespace OpenSim.Framework | |||
| 607 | 607 | ||
| 608 | // Prim stuff | 608 | // Prim stuff |
| 609 | // | 609 | // |
| 610 | m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256); | 610 | m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0); |
| 611 | allKeys.Remove("NonphysicalPrimMax"); | 611 | allKeys.Remove("NonphysicalPrimMax"); |
| 612 | m_physPrimMax = config.GetInt("PhysicalPrimMax", 10); | 612 | m_physPrimMax = config.GetInt("PhysicalPrimMax", 0); |
| 613 | allKeys.Remove("PhysicalPrimMax"); | 613 | allKeys.Remove("PhysicalPrimMax"); |
| 614 | m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); | 614 | m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); |
| 615 | allKeys.Remove("ClampPrimSize"); | 615 | allKeys.Remove("ClampPrimSize"); |