diff options
| author | Melanie | 2010-05-08 14:17:43 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-08 14:17:43 +0100 |
| commit | 420dd78fb7f48c4d6645773992cc2da968529b15 (patch) | |
| tree | 49ee8760c5c9ce6d28c3002fb6bf251e707546bf /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC-420dd78fb7f48c4d6645773992cc2da968529b15.zip opensim-SC-420dd78fb7f48c4d6645773992cc2da968529b15.tar.gz opensim-SC-420dd78fb7f48c4d6645773992cc2da968529b15.tar.bz2 opensim-SC-420dd78fb7f48c4d6645773992cc2da968529b15.tar.xz | |
Merge branch 'careminster' into careminster-presence-refactor
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 2197ced..122ed02 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -727,7 +727,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 727 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 727 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |
| 728 | // TODO: Change default to true once the feature is supported | 728 | // TODO: Change default to true once the feature is supported |
| 729 | m_usePreJump = startupConfig.GetBoolean("enableprejump", false); | 729 | m_usePreJump = startupConfig.GetBoolean("enableprejump", false); |
| 730 | 730 | m_usePreJump = true; // Above line fails!? | |
| 731 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 731 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); |
| 732 | if (RegionInfo.NonphysPrimMax > 0) | 732 | if (RegionInfo.NonphysPrimMax > 0) |
| 733 | { | 733 | { |