aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-11-15 18:00:34 +0000
committerHomer Horwitz2008-11-15 18:00:34 +0000
commite26169f0b083a4e13bf8f6af01b499149d2b03de (patch)
tree75b3e66700306675e03b25e30c6f1e47f5d756d5
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)
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs3
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs3
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
4 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 3669bdc..be50cc6 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -345,8 +345,7 @@ namespace OpenSim.Data.MSSQL
345 345
346 foreach (SceneObjectPart prim in obj.Children.Values) 346 foreach (SceneObjectPart prim in obj.Children.Values)
347 { 347 {
348 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 348 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
349 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
350 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) 349 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
351 { 350 {
352 351
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 70940db..e793b7e 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -305,8 +305,7 @@ namespace OpenSim.Data.MySQL
305 { 305 {
306 foreach (SceneObjectPart prim in obj.Children.Values) 306 foreach (SceneObjectPart prim in obj.Children.Values)
307 { 307 {
308 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 308 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
309 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
310 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) 309 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
311 { 310 {
312 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 311 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index cc3ad06..9d6d500 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -312,8 +312,7 @@ namespace OpenSim.Data.SQLite
312 { 312 {
313 foreach (SceneObjectPart prim in obj.Children.Values) 313 foreach (SceneObjectPart prim in obj.Children.Values)
314 { 314 {
315 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 315 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
316 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
317 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) 316 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
318 { 317 {
319 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 318 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
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");