Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index f6b690c..58ca00c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -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)