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/Framework | |
| 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/Framework/RegionInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index b88895f..c531e8a 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -609,9 +609,9 @@ namespace OpenSim.Framework | |||
| 609 | 609 | ||
| 610 | // Prim stuff | 610 | // Prim stuff |
| 611 | // | 611 | // |
| 612 | m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256); | 612 | m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0); |
| 613 | allKeys.Remove("NonphysicalPrimMax"); | 613 | allKeys.Remove("NonphysicalPrimMax"); |
| 614 | m_physPrimMax = config.GetInt("PhysicalPrimMax", 10); | 614 | m_physPrimMax = config.GetInt("PhysicalPrimMax", 0); |
| 615 | allKeys.Remove("PhysicalPrimMax"); | 615 | allKeys.Remove("PhysicalPrimMax"); |
| 616 | m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); | 616 | m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); |
| 617 | allKeys.Remove("ClampPrimSize"); | 617 | allKeys.Remove("ClampPrimSize"); |