From e26169f0b083a4e13bf8f6af01b499149d2b03de Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Sat, 15 Nov 2008 18:00:34 +0000 Subject: Mantis#2552: Thanks idb, for a patch that fixes persistence of physical prims. (added a fix for the broken build from last commit, too) --- OpenSim/Data/MSSQL/MSSQLRegionData.cs | 3 +-- OpenSim/Data/MySQL/MySQLRegionData.cs | 3 +-- OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 +-- OpenSim/Region/Environment/Scenes/Scene.cs | 4 ++-- 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 foreach (SceneObjectPart prim in obj.Children.Values) { - if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 - && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0 + if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) { 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 { foreach (SceneObjectPart prim in obj.Children.Values) { - if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 - && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0 + if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) { //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 { foreach (SceneObjectPart prim in obj.Children.Values) { - if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 - && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0 + if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) { 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 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); m_dontPersistBefore = - startupConfig.GetInt("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); + startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); m_dontPersistBefore *= 10000000; m_persistAfter = - startupConfig.GetInt("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); + startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); m_persistAfter *= 10000000; m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); -- cgit v1.1