ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Scripts edited within a prim will now be persisted correctly

Browse Source 
* On restart the latest save will be restored rather than the very first dragged in scripts
* Also add previously missed out database commits to separate prim inventory commit path (sigh)
This commit is contained in:
Justin Clarke Casey
2008-01-21 16:42:53 +00:00
parent 38991ba0e6
commit 46fe6e2f97
6 changed files with 71 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
View File

@@ -63,7 +63,7 @@ namespace OpenSim.Region.Environment.Interfaces
/// Store a prim's inventory
/// </summary>
/// <returns></returns>
void StorePrimInventory(LLUUID primID, IDictionary<LLUUID, TaskInventoryItem> items);
void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items);
List<SceneObjectGroup> LoadObjects(LLUUID regionUUID);

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

@@ -401,7 +401,10 @@ namespace OpenSim.Region.Environment.Scenes
{
if (HasInventoryChanged)
{
datastore.StorePrimInventory(UUID, TaskInventory);
lock (TaskInventory)
{
datastore.StorePrimInventory(UUID, TaskInventory.Values);
}
HasInventoryChanged = false;
}

2
OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
View File

@@ -754,7 +754,7 @@ namespace OpenSim.DataStore.MSSQL
}
// see IRegionDatastore
public void StorePrimInventory(LLUUID primID, IDictionary<LLUUID, TaskInventoryItem> items)
public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
{
// No implementation yet
}

2
OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
View File

@@ -51,7 +51,7 @@ namespace OpenSim.DataStore.NullStorage
}
// see IRegionDatastore
public void StorePrimInventory(LLUUID primID, IDictionary<LLUUID, TaskInventoryItem> items)
public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
{
}