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/Region/Framework/Scenes/Scene.cs | |
| 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/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 186e01c..3347822 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 645 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); | 645 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); |
| 646 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); | 646 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); |
| 647 | 647 | ||
| 648 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 648 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); |
| 649 | if (RegionInfo.NonphysPrimMax > 0) | 649 | if (RegionInfo.NonphysPrimMax > 0) |
| 650 | { | 650 | { |
| 651 | m_maxNonphys = RegionInfo.NonphysPrimMax; | 651 | m_maxNonphys = RegionInfo.NonphysPrimMax; |