diff options
| author | Melanie | 2012-02-05 20:58:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-05 20:58:04 +0000 |
| commit | 54fc78013d1eb946551656849e7007427ef4aec3 (patch) | |
| tree | fae81b9031f5ae0fb07d0f3e61eb83946bbc26b1 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert my two quick fixes for the lag issue and put in the real fix, which (diff) | |
| download | opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.zip opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.gz opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.bz2 opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 03ddbc5..ec5cf32 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -668,8 +668,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 668 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); | 668 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); |
| 669 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); | 669 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); |
| 670 | 670 | ||
| 671 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 671 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); |
| 672 | |||
| 673 | if (RegionInfo.NonphysPrimMax > 0) | 672 | if (RegionInfo.NonphysPrimMax > 0) |
| 674 | { | 673 | { |
| 675 | m_maxNonphys = RegionInfo.NonphysPrimMax; | 674 | m_maxNonphys = RegionInfo.NonphysPrimMax; |