aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorHomer Horwitz2008-11-15 18:00:34 +0000
committerHomer Horwitz2008-11-15 18:00:34 +0000
commite26169f0b083a4e13bf8f6af01b499149d2b03de (patch)
tree75b3e66700306675e03b25e30c6f1e47f5d756d5 /OpenSim/Region
parentMantis #2621: Thanks idb, for a patch that will persist regularily changed ob... (diff)
downloadopensim-SC_OLD-e26169f0b083a4e13bf8f6af01b499149d2b03de.zip
opensim-SC_OLD-e26169f0b083a4e13bf8f6af01b499149d2b03de.tar.gz
opensim-SC_OLD-e26169f0b083a4e13bf8f6af01b499149d2b03de.tar.bz2
opensim-SC_OLD-e26169f0b083a4e13bf8f6af01b499149d2b03de.tar.xz
Mantis#2552: Thanks idb, for a patch that fixes persistence of physical prims.
(added a fix for the broken build from last commit, too)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index eb9d509..08b7bdb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -344,10 +344,10 @@ namespace OpenSim.Region.Environment.Scenes
344 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); 344 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
345 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); 345 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false);
346 m_dontPersistBefore = 346 m_dontPersistBefore =
347 startupConfig.GetInt("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); 347 startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
348 m_dontPersistBefore *= 10000000; 348 m_dontPersistBefore *= 10000000;
349 m_persistAfter = 349 m_persistAfter =
350 startupConfig.GetInt("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); 350 startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
351 m_persistAfter *= 10000000; 351 m_persistAfter *= 10000000;
352 352
353 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); 353 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");