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

Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge 

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
avinationmerge
Melanie 2011-10-11 20:57:31 +01:00
parent e15917f465 42f1b88eb2
commit 7d2a3dc174
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -988,11 +988,16 @@ namespace OpenSim.Region.Framework.Scenes
private bool CreateInventoryFileName()
{
// m_log.DebugFormat(
// "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}",
// m_part.Name, m_part.UUID, m_part.LocalId, m_inventorySerial);
if (m_inventoryFileName == String.Empty ||
m_inventoryFileNameSerial < m_inventorySerial)
{
m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
m_inventoryFileNameSerial = m_inventorySerial;
return true;
}
@ -1025,6 +1030,12 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
if (m_items.Count == 0) // No inventory
{
client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
return;
}
if (!changed)
{
if (m_inventoryFileData.Length > 2)