diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 779f898..05036f1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -726,8 +726,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
726 | //Animation states | 726 | //Animation states |
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", true); |
730 | m_usePreJump = true; // Above line fails!? | ||
731 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 730 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); |
732 | if (RegionInfo.NonphysPrimMax > 0) | 731 | if (RegionInfo.NonphysPrimMax > 0) |
733 | { | 732 | { |
@@ -3513,7 +3512,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3513 | if (tp == TeleportFlags.ViaLogin) | 3512 | if (tp == TeleportFlags.ViaLogin) |
3514 | { | 3513 | { |
3515 | if (land != null && !TestLandRestrictions(agent, land, out reason)) | 3514 | if (land != null && !TestLandRestrictions(agent, land, out reason)) |
3516 | { | 3515 | { |
3517 | m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString()); | 3516 | m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString()); |
3518 | return false; | 3517 | return false; |
3519 | } | 3518 | } |