OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mantis#2552: Thanks idb, for a patch that fixes persistence of physical prims. 

(added a fix for the broken build from last commit, too)
0.6.1-post-fixes
Homer Horwitz 2008-11-15 18:00:34 +00:00
parent 21b69ac515
commit e26169f0b0
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/MSSQL/MSSQLRegionData.cs
View File

@ -345,8 +345,7 @@ namespace OpenSim.Data.MSSQL
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Children.Values)
{ {
if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
{ {

3
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@ -305,8 +305,7 @@ namespace OpenSim.Data.MySQL
{ {
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Children.Values)
{ {
if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
{ {
//m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);

3
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -312,8 +312,7 @@ namespace OpenSim.Data.SQLite
{ {
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Children.Values)
{ {
if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0) && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
{ {
m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -344,10 +344,10 @@ namespace OpenSim.Region.Environment.Scenes
m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false);
m_dontPersistBefore = m_dontPersistBefore =
startupConfig.GetInt("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
m_dontPersistBefore *= 10000000; m_dontPersistBefore *= 10000000;
m_persistAfter = m_persistAfter =
startupConfig.GetInt("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
m_persistAfter *= 10000000; m_persistAfter *= 10000000;
m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");