The regionUUID is now being passed to the datastore calls.

This commit is contained in:
MW
2007-08-20 15:49:06 +00:00
parent 4af33c4da6
commit 31a81e17be
9 changed files with 65 additions and 34 deletions

View File

@@ -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>();

View File

@@ -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>();

View File

@@ -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>();
}