ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source 
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
This commit is contained in:
Melanie
2010-09-13 16:16:40 +01:00
parent d264f0d301 18a9ac6b39
commit 6a1ce17cdb
216 changed files with 6585 additions and 4483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_items.LockItemsForWrite(true);
if (0 == Items.Count)
if (Items.Count == 0)
{
m_items.LockItemsForWrite(false);
return;
@@ -1010,7 +1010,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Process inventory backup
/// </summary>
/// <param name="datastore"></param>
public void ProcessInventoryBackup(IRegionDataStore datastore)
public void ProcessInventoryBackup(ISimulationDataService datastore)
{
if (HasInventoryChanged)
{
@@ -1257,7 +1257,7 @@ namespace OpenSim.Region.Framework.Scenes
engine.ResumeScript(item.ItemID);
}
}
}
}
}
Items.LockItemsForRead(false);