aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authormeta72010-08-11 13:40:31 -0700
committermeta72010-08-11 13:40:31 -0700
commitac581b532ef7ffe4918937c2771a8b0dee400074 (patch)
tree380fef1454b090919a7b5a6053a989eccb4e006b /OpenSim/Region/Framework
parentFix Omega getting overwritten on startup. (diff)
parentLog the state of the prejump flag (diff)
downloadopensim-SC_OLD-ac581b532ef7ffe4918937c2771a8b0dee400074.zip
opensim-SC_OLD-ac581b532ef7ffe4918937c2771a8b0dee400074.tar.gz
opensim-SC_OLD-ac581b532ef7ffe4918937c2771a8b0dee400074.tar.bz2
opensim-SC_OLD-ac581b532ef7ffe4918937c2771a8b0dee400074.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7e83634..7a97669 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -728,6 +728,8 @@ namespace OpenSim.Region.Framework.Scenes
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", true); 729 m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
730 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 730 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
731
732 m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF");
731 if (RegionInfo.NonphysPrimMax > 0) 733 if (RegionInfo.NonphysPrimMax > 0)
732 { 734 {
733 m_maxNonphys = RegionInfo.NonphysPrimMax; 735 m_maxNonphys = RegionInfo.NonphysPrimMax;