diff options
Diffstat (limited to '')
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 | |||
43 | return; | 43 | return; |
44 | } | 44 | } |
45 | 45 | ||
46 | public void StoreObject(SceneObjectGroup obj) | 46 | public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) |
47 | { | 47 | { |
48 | db.Set(obj); | 48 | db.Set(obj); |
49 | } | 49 | } |
50 | 50 | ||
51 | public void RemoveObject(LLUUID obj) | 51 | public void RemoveObject(LLUUID obj, LLUUID regionUUID) |
52 | { | 52 | { |
53 | IObjectSet result = db.Query(new SceneObjectQuery(obj)); | 53 | IObjectSet result = db.Query(new SceneObjectQuery(obj)); |
54 | if (result.Count > 0) | 54 | if (result.Count > 0) |
@@ -58,7 +58,7 @@ namespace OpenSim.DataStore.DB4oStorage | |||
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | public List<SceneObjectGroup> LoadObjects() | 61 | public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) |
62 | { | 62 | { |
63 | IObjectSet result = db.Get(typeof(SceneObjectGroup)); | 63 | IObjectSet result = db.Get(typeof(SceneObjectGroup)); |
64 | List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); | 64 | 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 | |||
485 | } | 485 | } |
486 | } | 486 | } |
487 | 487 | ||
488 | public void StoreObject(SceneObjectGroup obj) | 488 | public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) |
489 | { | 489 | { |
490 | foreach (SceneObjectPart prim in obj.Children.Values) | 490 | foreach (SceneObjectPart prim in obj.Children.Values) |
491 | { | 491 | { |
@@ -498,7 +498,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage | |||
498 | // MainLog.Instance.Verbose("Dump of prims:", ds.GetXml()); | 498 | // MainLog.Instance.Verbose("Dump of prims:", ds.GetXml()); |
499 | } | 499 | } |
500 | 500 | ||
501 | public void RemoveObject(LLUUID obj) | 501 | public void RemoveObject(LLUUID obj, LLUUID regionUUID) |
502 | { | 502 | { |
503 | DataTable prims = ds.Tables["prims"]; | 503 | DataTable prims = ds.Tables["prims"]; |
504 | DataTable shapes = ds.Tables["primshapes"]; | 504 | DataTable shapes = ds.Tables["primshapes"]; |
@@ -520,7 +520,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage | |||
520 | shapeDa.Update(ds, "primshapes"); | 520 | shapeDa.Update(ds, "primshapes"); |
521 | } | 521 | } |
522 | 522 | ||
523 | public List<SceneObjectGroup> LoadObjects() | 523 | public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) |
524 | { | 524 | { |
525 | Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); | 525 | Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); |
526 | List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); | 526 | 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 | |||
18 | return; | 18 | return; |
19 | } | 19 | } |
20 | 20 | ||
21 | public void StoreObject(SceneObjectGroup obj) | 21 | public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) |
22 | { | 22 | { |
23 | 23 | ||
24 | } | 24 | } |
25 | 25 | ||
26 | public void RemoveObject(LLUUID obj) | 26 | public void RemoveObject(LLUUID obj, LLUUID regionUUID) |
27 | { | 27 | { |
28 | 28 | ||
29 | } | 29 | } |
30 | 30 | ||
31 | public List<SceneObjectGroup> LoadObjects() | 31 | public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) |
32 | { | 32 | { |
33 | return new List<SceneObjectGroup>(); | 33 | return new List<SceneObjectGroup>(); |
34 | } | 34 | } |