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

Restore CM loking after core extract

avinationmerge
Melanie 2010-12-21 20:48:58 +00:00
parent 2f84f2171f
commit c9aa420c2d
1 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -953,8 +953,8 @@ namespace OpenSim.Region.Framework.Scenes
InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero); InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
lock (m_items) Items.LockItemsForRead(true);
{
if (m_inventorySerial == 0) // No inventory if (m_inventorySerial == 0) // No inventory
{ {
client.SendTaskInventory(m_part.UUID, 0, new byte[0]); client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
@ -1024,9 +1024,8 @@ namespace OpenSim.Region.Framework.Scenes
invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
invString.AddSectionEnd(); invString.AddSectionEnd();
} }
}
int count = m_items.Count; Items.LockItemsForRead(false);
m_inventoryFileData = Utils.StringToBytes(invString.BuildString); m_inventoryFileData = Utils.StringToBytes(invString.BuildString);