diff options
| author | Melanie | 2011-11-05 23:06:59 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 23:06:59 +0000 |
| commit | 57194facdc4aae3b9498041aad56d4f1942225fc (patch) | |
| tree | d9e300d1489d9b04b24bff7ed885e2f723492548 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-57194facdc4aae3b9498041aad56d4f1942225fc.zip opensim-SC-57194facdc4aae3b9498041aad56d4f1942225fc.tar.gz opensim-SC-57194facdc4aae3b9498041aad56d4f1942225fc.tar.bz2 opensim-SC-57194facdc4aae3b9498041aad56d4f1942225fc.tar.xz | |
Fix up with core changes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5d4ddea..42ce61e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -675,7 +675,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 675 | 675 | ||
| 676 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 676 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); |
| 677 | 677 | ||
| 678 | m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF"); | ||
| 679 | if (RegionInfo.NonphysPrimMax > 0) | 678 | if (RegionInfo.NonphysPrimMax > 0) |
| 680 | { | 679 | { |
| 681 | m_maxNonphys = RegionInfo.NonphysPrimMax; | 680 | m_maxNonphys = RegionInfo.NonphysPrimMax; |