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 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Data')

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);
-- 
cgit v1.1