From b70da6ac1955ada29e1cb4dbe9aeb915735ec686 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Wed, 30 Apr 2008 16:52:12 +0000
Subject: * Patch by Melanie.  Implements proper objectflags on child objects. 
 Thanks Melanie! RE: 0001079: r4387. touch() event does not fire when touch
 script is in root prim and child prims are touched

---
 OpenSim/Data/MSSQL/MSSQLDataStore.cs    | 2 +-
 OpenSim/Data/MySQL/MySQLDataStore.cs    | 2 +-
 OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index e881cf1..6b3b8ef 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Data.MSSQL
             {
                 foreach (SceneObjectPart prim in obj.Children.Values)
                 {
-                    if ((prim.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0)
+                    if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0)
                     {
                         m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
                         addPrim(prim, obj.UUID, regionUUID);
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 08e4456..7714fdc 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL
             {
                 foreach (SceneObjectPart prim in obj.Children.Values)
                 {
-                    if ((prim.ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
+                    if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0)
                     {
                         m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
                         addPrim(prim, obj.UUID, regionUUID);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index d385376..e075c22 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -182,7 +182,7 @@ namespace OpenSim.Data.SQLite
             {
                 foreach (SceneObjectPart prim in obj.Children.Values)
                 {
-                    if ((prim.ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
+                    if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0)
                     {
                         m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
                         addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
-- 
cgit v1.1