From c35e3b1f3531e9149cad0c9ad13bf3f4954afc90 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Sat, 25 Aug 2007 13:06:09 +0000
Subject: [PATCH] updated to include saving of object flags. People will need
 to blow away their databases after this point.

---
 .../Environment/Scenes/SceneObjectPart.cs     | 23 +++++++++++--------
 .../MonoSqliteDataStore.cs                    |  3 +++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index d681f99a64..e32c1968e7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_name = value; }
         }
 
-        protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 268435456 + 128 + (uint)LLObject.ObjectFlags.Physics;
+        protected LLObject.ObjectFlags m_flags;
         public uint ObjectFlags
         {
             get { return (uint)m_flags; }
@@ -239,18 +239,23 @@ namespace OpenSim.Region.Environment.Scenes
             this.Velocity = new LLVector3(0, 0, 0);
             this.AngularVelocity = new LLVector3(0, 0, 0);
             this.Acceleration = new LLVector3(0, 0, 0);
-
+            
             m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString();
             m_folderID = LLUUID.Random();
-           
-            //temporary code just so the m_flags field doesn't give a compiler warning
-            if (m_flags == LLObject.ObjectFlags.AllowInventoryDrop)
-            {
-
-            }
+            
+            m_flags = 0;
+            m_flags |= LLObject.ObjectFlags.ObjectModify |
+                LLObject.ObjectFlags.ObjectCopy |
+                LLObject.ObjectFlags.ObjectYouOwner |
+                LLObject.ObjectFlags.Touch |
+                LLObject.ObjectFlags.ObjectMove |
+                LLObject.ObjectFlags.AllowInventoryDrop |
+                LLObject.ObjectFlags.ObjectTransfer |
+                LLObject.ObjectFlags.ObjectOwnerModify;
+            
             ScheduleFullUpdate();
         }
-
+        
         /// <summary>
         /// Re/create a SceneObjectPart (prim)
         /// currently not used, and maybe won't be
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index d711e4bbf0..c1168ece0c 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -275,6 +275,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
             createCol(prims, "SitName", typeof(System.String));
             createCol(prims, "TouchName", typeof(System.String));
             // permissions
+            createCol(prims, "ObjectFlags", typeof(System.Int32));
             createCol(prims, "CreatorID", typeof(System.String));
             createCol(prims, "OwnerID", typeof(System.String));
             createCol(prims, "GroupID", typeof(System.String));
@@ -379,6 +380,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
             prim.SitName = (String)row["SitName"];
             prim.TouchName = (String)row["TouchName"];
             // permissions
+            prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
             prim.CreatorID = new LLUUID((String)row["CreatorID"]);
             prim.OwnerID = new LLUUID((String)row["OwnerID"]);
             prim.GroupID = new LLUUID((String)row["GroupID"]);
@@ -439,6 +441,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
             row["SitName"] = prim.SitName;
             row["TouchName"] = prim.TouchName;
             // permissions
+            row["ObjectFlags"] = prim.ObjectFlags;
             row["CreatorID"] = prim.CreatorID;
             row["OwnerID"] = prim.OwnerID;
             row["GroupID"] = prim.GroupID;