diff options
| author | Melanie | 2012-09-24 20:14:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-24 20:14:00 +0100 |
| commit | bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6 (patch) | |
| tree | 2ac67907f6333bbbc9e4d821c6607b53d0e22acb /OpenSim/Framework/RegionInfo.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | HG Rez object: warn the user if the item or asset cannot be found. (diff) | |
| download | opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.zip opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.gz opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.bz2 opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index fc64ff9..e7bed6a 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -645,11 +645,11 @@ namespace OpenSim.Framework | |||
| 645 | 645 | ||
| 646 | #region Prim stuff | 646 | #region Prim stuff |
| 647 | 647 | ||
| 648 | m_nonphysPrimMin = config.GetFloat("NonphysicalPrimMin", 0); | 648 | m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0); |
| 649 | allKeys.Remove("NonphysicalPrimMin"); | 649 | allKeys.Remove("NonPhysicalPrimMin"); |
| 650 | 650 | ||
| 651 | m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0); | 651 | m_nonphysPrimMax = config.GetInt("NonPhysicalPrimMax", 0); |
| 652 | allKeys.Remove("NonphysicalPrimMax"); | 652 | allKeys.Remove("NonPhysicalPrimMax"); |
| 653 | 653 | ||
| 654 | m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0); | 654 | m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0); |
| 655 | allKeys.Remove("PhysicalPrimMin"); | 655 | allKeys.Remove("PhysicalPrimMin"); |