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

release lock a bit sooner when not needed, add a try on more complex db 

store call
avinationmerge
UbitUmarov 2014-09-21 23:23:20 +01:00
parent f95bb53371
commit d1ccc6d5cc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1133,26 +1133,28 @@ namespace OpenSim.Region.Framework.Scenes
if (m_inventorySerial == 0) // No inventory if (m_inventorySerial == 0) // No inventory
{ {
client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
Items.LockItemsForRead(false); Items.LockItemsForRead(false);
client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
return; return;
} }
if (m_items.Count == 0) // No inventory if (m_items.Count == 0) // No inventory
{ {
client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
Items.LockItemsForRead(false); Items.LockItemsForRead(false);
client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
return; return;
} }
if (!changed) if (!changed)
{ {
Items.LockItemsForRead(false);
xferManager.AddNewFile(filename, xferManager.AddNewFile(filename,
m_inventoryFileData); m_inventoryFileData);
client.SendTaskInventory(m_part.UUID, (short)m_inventoryFileNameSerial, client.SendTaskInventory(m_part.UUID, (short)m_inventoryFileNameSerial,
Util.StringToBytes256(filename)); Util.StringToBytes256(filename));
Items.LockItemsForRead(false);
return; return;
} }
@ -1238,7 +1240,12 @@ namespace OpenSim.Region.Framework.Scenes
// if (HasInventoryChanged) // if (HasInventoryChanged)
// { // {
Items.LockItemsForRead(true); Items.LockItemsForRead(true);
datastore.StorePrimInventory(m_part.UUID, Items.Values); try
{
datastore.StorePrimInventory(m_part.UUID, Items.Values);
}
catch(){}
Items.LockItemsForRead(false); Items.LockItemsForRead(false);
HasInventoryChanged = false; HasInventoryChanged = false;