diff options
| author | Homer Horwitz | 2008-11-15 18:00:34 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-11-15 18:00:34 +0000 |
| commit | e26169f0b083a4e13bf8f6af01b499149d2b03de (patch) | |
| tree | 75b3e66700306675e03b25e30c6f1e47f5d756d5 /OpenSim/Data | |
| parent | Mantis #2621: Thanks idb, for a patch that will persist regularily changed ob... (diff) | |
| download | opensim-SC-e26169f0b083a4e13bf8f6af01b499149d2b03de.zip opensim-SC-e26169f0b083a4e13bf8f6af01b499149d2b03de.tar.gz opensim-SC-e26169f0b083a4e13bf8f6af01b499149d2b03de.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 |
3 files changed, 3 insertions, 6 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); |