From f20dc512e87983b9ba6b86f806489380d3cfef5a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 9 Aug 2010 02:46:09 +0200
Subject: Whitespace conflict

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 779f898..06bbe32 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3513,7 +3513,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (tp == TeleportFlags.ViaLogin)
             {
                 if (land != null && !TestLandRestrictions(agent, land, out reason))
-                {
+                {
                     m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
                     return false;
                 }
-- 
cgit v1.1


From 0f9eebdfb1e948bc1ffb148322e668b5a2f560a6 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 10 Aug 2010 03:52:00 +0200
Subject: Change prejump from hardcoded true to default true so it can be
 disabled. It completely destroys roleplay jumping

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 06bbe32..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
                 //Animation states
                 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
                 // TODO: Change default to true once the feature is supported
-                m_usePreJump = startupConfig.GetBoolean("enableprejump", false);
-                m_usePreJump = true;	// Above line fails!?
+                m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
                 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
                 if (RegionInfo.NonphysPrimMax > 0)
                 {
-- 
cgit v1.1