Start of replacing the old SceneObject/Primitive classes with the new versions.

PLEASE NOTE: that with this revision some prim related features may be broke for a while. (things like linking prims and the parcel prim count.)
Also this revision may not work on mono, but that will be fixed soon.  

2 files changed, 11 insertions, 11 deletions

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
index 06c9069..9c5e4bc 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
@@ -24,9 +24,9 @@ namespace OpenSim.DataStore.DB4oStorage
             globalIDSearch = find;
         }
 
-        public bool Match(SceneObject obj)
+        public bool Match(SceneObjectGroup obj)
         {
-            return obj.rootUUID == globalIDSearch;
+            return obj.UUID == globalIDSearch;
         }
     }
 
@@ -43,7 +43,7 @@ namespace OpenSim.DataStore.DB4oStorage
             return;
         }
 
-        public void StoreObject(SceneObject obj)
+        public void StoreObject(SceneObjectGroup obj)
         {
             db.Set(obj);
         }
@@ -53,21 +53,21 @@ namespace OpenSim.DataStore.DB4oStorage
             IObjectSet result = db.Query(new SceneObjectQuery(obj));
             if (result.Count > 0)
             {
-                SceneObject item = (SceneObject)result.Next();
+                SceneObjectGroup item = (SceneObjectGroup)result.Next();
                 db.Delete(item);
             }
         }
 
-        public List<SceneObject> LoadObjects()
+        public List<SceneObjectGroup> LoadObjects()
         {
-            IObjectSet result = db.Get(typeof(SceneObject));
-            List<SceneObject> retvals = new List<SceneObject>();
+            IObjectSet result = db.Get(typeof(SceneObjectGroup));
+            List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
 
             MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects");
 
             foreach (Object obj in result)
             {
-                retvals.Add((SceneObject)obj);
+                retvals.Add((SceneObjectGroup)obj);
             }
 
             return retvals;
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
index fc003e8..643508e 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
@@ -18,7 +18,7 @@ namespace OpenSim.DataStore.NullStorage
             return;
         }
 
-        public void StoreObject(SceneObject obj)
+        public void StoreObject(SceneObjectGroup obj)
         {
 
         }
@@ -28,9 +28,9 @@ namespace OpenSim.DataStore.NullStorage
 
         }
 
-        public List<SceneObject> LoadObjects()
+        public List<SceneObjectGroup> LoadObjects()
         {
-            return new List<SceneObject>();
+            return new List<SceneObjectGroup>();
         }
 
         public void StoreTerrain(double[,] ter)