diff options
author | Justin Clarke Casey | 2008-01-21 15:17:09 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-01-21 15:17:09 +0000 |
commit | 331aef2bae0f8d23a43e238d229ac63c831063f6 (patch) | |
tree | 1f1d951ff9f0d0bb239990952a5cda80a1d87dd0 /OpenSim/Framework | |
parent | Properly lock new separate database accesses (diff) | |
download | opensim-SC-331aef2bae0f8d23a43e238d229ac63c831063f6.zip opensim-SC-331aef2bae0f8d23a43e238d229ac63c831063f6.tar.gz opensim-SC-331aef2bae0f8d23a43e238d229ac63c831063f6.tar.bz2 opensim-SC-331aef2bae0f8d23a43e238d229ac63c831063f6.tar.xz |
Method rename
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index a752236..47b3c43 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |||
@@ -312,7 +312,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
312 | MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); | 312 | MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); |
313 | } | 313 | } |
314 | 314 | ||
315 | prim.AddInventoryItems(inventory); | 315 | prim.RestoreInventoryItems(inventory); |
316 | 316 | ||
317 | // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in | 317 | // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in |
318 | // every item). This data should really be stored in the prim table itself. | 318 | // every item). This data should really be stored in the prim table itself. |
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs index ba50dca..0035311 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs | |||
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
356 | MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); | 356 | MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); |
357 | } | 357 | } |
358 | 358 | ||
359 | prim.AddInventoryItems(inventory); | 359 | prim.RestoreInventoryItems(inventory); |
360 | 360 | ||
361 | // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in | 361 | // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in |
362 | // every item). This data should really be stored in the prim table itself. | 362 | // every item). This data should really be stored in the prim table itself. |