The regionUUID is now being passed to the datastore calls.

3 files changed, 9 insertions, 9 deletions

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
index 9c5e4bc..73eb635 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
@@ -43,12 +43,12 @@ namespace OpenSim.DataStore.DB4oStorage
             return;
         }
 
-        public void StoreObject(SceneObjectGroup obj)
+        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
         {
             db.Set(obj);
         }
 
-        public void RemoveObject(LLUUID obj)
+        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
         {
             IObjectSet result = db.Query(new SceneObjectQuery(obj));
             if (result.Count > 0)
@@ -58,7 +58,7 @@ namespace OpenSim.DataStore.DB4oStorage
             }
         }
 
-        public List<SceneObjectGroup> LoadObjects()
+        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
         {
             IObjectSet result = db.Get(typeof(SceneObjectGroup));
             List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index 391ac84..b6c6c83 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -485,7 +485,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
             }
         }
 
-        public void StoreObject(SceneObjectGroup obj)
+        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
         {
             foreach (SceneObjectPart prim in obj.Children.Values)
             {
@@ -498,7 +498,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
             // MainLog.Instance.Verbose("Dump of prims:", ds.GetXml());
         }
 
-        public void RemoveObject(LLUUID obj)
+        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
         {
             DataTable prims = ds.Tables["prims"];
             DataTable shapes = ds.Tables["primshapes"];
@@ -520,7 +520,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
             shapeDa.Update(ds, "primshapes");
         }
 
-        public List<SceneObjectGroup> LoadObjects()
+        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
         {
             Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>();
             List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
index 643508e..176a534 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
@@ -18,17 +18,17 @@ namespace OpenSim.DataStore.NullStorage
             return;
         }
 
-        public void StoreObject(SceneObjectGroup obj)
+        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
         {
 
         }
 
-        public void RemoveObject(LLUUID obj)
+        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
         {
 
         }
 
-        public List<SceneObjectGroup> LoadObjects()
+        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
         {
             return new List<SceneObjectGroup>();
         }