aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-06 18:02:12 +0000
committerMelanie Thielker2009-04-06 18:02:12 +0000
commitfb900f60555a0b2cce1350b3726d38e210d52799 (patch)
treee86cc1e055179129c231dd050bccffebf4cd23a8 /OpenSim/Region/Framework/Scenes/Scene.cs
parentincluding Makefile.local iff it exists (diff)
downloadopensim-SC-fb900f60555a0b2cce1350b3726d38e210d52799.zip
opensim-SC-fb900f60555a0b2cce1350b3726d38e210d52799.tar.gz
opensim-SC-fb900f60555a0b2cce1350b3726d38e210d52799.tar.bz2
opensim-SC-fb900f60555a0b2cce1350b3726d38e210d52799.tar.xz
Applying Intimidated's patch to fix anim handling.
Fixes Mantis #3417
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 30257f1..0da819d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -86,7 +86,8 @@ namespace OpenSim.Region.Framework.Scenes
86 public bool m_clampPrimSize = false; 86 public bool m_clampPrimSize = false;
87 public bool m_trustBinaries = false; 87 public bool m_trustBinaries = false;
88 public bool m_allowScriptCrossings = false; 88 public bool m_allowScriptCrossings = false;
89 89 public bool m_useFlySlow = false;
90 public bool m_usePreJump = false;
90 public bool m_seeIntoRegionFromNeighbor; 91 public bool m_seeIntoRegionFromNeighbor;
91 public int MaxUndoCount = 5; 92 public int MaxUndoCount = 5;
92 private int m_RestartTimerCounter; 93 private int m_RestartTimerCounter;
@@ -342,6 +343,12 @@ namespace OpenSim.Region.Framework.Scenes
342 // Region config overrides global config 343 // Region config overrides global config
343 // 344 //
344 IConfig startupConfig = m_config.Configs["Startup"]; 345 IConfig startupConfig = m_config.Configs["Startup"];
346
347 //Animation states
348 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
349 // TODO: Change default to true once the feature is supported
350 m_usePreJump = startupConfig.GetBoolean("enableprejump", false);
351
345 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 352 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
346 if (RegionInfo.NonphysPrimMax > 0) 353 if (RegionInfo.NonphysPrimMax > 0)
347 m_maxNonphys = RegionInfo.NonphysPrimMax; 354 m_maxNonphys = RegionInfo.NonphysPrimMax;