OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Method rename

ThreadPoolClientBranch
Justin Clarke Casey 2008-01-21 15:17:09 +00:00
parent 7ca8e28a9a
commit 331aef2bae
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
View File

@ -312,7 +312,7 @@ namespace OpenSim.Framework.Data.MySQL
MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID);
} }
prim.AddInventoryItems(inventory); prim.RestoreInventoryItems(inventory);
// XXX A nasty little hack to recover the folder id for the prim (which is currently stored in // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in
// every item). This data should really be stored in the prim table itself. // every item). This data should really be stored in the prim table itself.

2
OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
View File

@ -356,7 +356,7 @@ namespace OpenSim.Framework.Data.SQLite
MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID);
} }
prim.AddInventoryItems(inventory); prim.RestoreInventoryItems(inventory);
// XXX A nasty little hack to recover the folder id for the prim (which is currently stored in // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in
// every item). This data should really be stored in the prim table itself. // every item). This data should really be stored in the prim table itself.

8
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -216,11 +216,13 @@ namespace OpenSim.Region.Environment.Scenes
} }
/// <summary> /// <summary>
/// Add a whole collection of items to the prim's inventory at once. We assume that the items already /// Restore a whole collection of items to the prim's inventory at once.
/// have all their fields correctly filled out. /// We assume that the items already have all their fields correctly filled out.
/// The items are not flagged for persistence to the database, since they are being restored
/// from persistence rather than being newly added.
/// </summary> /// </summary>
/// <param name="items"></param> /// <param name="items"></param>
public void AddInventoryItems(ICollection<TaskInventoryItem> items) public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
{ {
lock (m_taskInventory) lock (m_taskInventory)
{ {