6 files changed, 90 insertions, 157 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index ed40da9..4b17b9a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -196,13 +196,6 @@ namespace OpenSim.Region.Framework.Interfaces
         int RemoveInventoryItem(UUID itemID);
 
         /// <summary>
-        /// Return the name with which a client can request a xfer of this prim's inventory metadata
-        /// </summary>
-        string GetInventoryFileName();
-
-        bool GetInventoryFileName(IClientAPI client, uint localID);
-
-        /// <summary>
         /// Serialize all the metadata for the items in this prim's inventory ready for sending to the client
         /// </summary>
         /// <param name="xferManager"></param>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a1f1ea5..47c574a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -951,23 +951,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="primLocalID"></param>
         public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID)
         {
-            SceneObjectGroup group = GetGroupByPrim(primLocalID);
-            if (group != null)
-            {
-                bool fileChange = group.GetPartInventoryFileName(remoteClient, primLocalID);
-                if (fileChange)
-                {
-                    if (XferManager != null)
-                    {
-                        group.RequestInventoryFile(remoteClient, primLocalID, XferManager);
-                    }
-                }
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[PRIM INVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID);
-            }
+            SceneObjectPart part = GetSceneObjectPart(primLocalID);
+            if (part == null)
+                return;
+
+            if (XferManager != null)
+                part.Inventory.RequestInventoryFile(remoteClient, XferManager);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d915807..deeb817 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1093,6 +1093,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
                 HeartbeatThread.Abort();
+                Watchdog.RemoveThread(HeartbeatThread.ManagedThreadId);
                 HeartbeatThread = null;
             }
             m_lastUpdate = Util.EnvironmentTickCount();
@@ -4801,7 +4802,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_firstHeartbeat)
                 return;
 
-            if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000)
+            if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 10000)
                 StartTimer();
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 6cc7231..50521c4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -77,49 +77,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="localID"></param>
-        public bool GetPartInventoryFileName(IClientAPI remoteClient, uint localID)
-        {
-            SceneObjectPart part = GetChildPart(localID);
-            if (part != null)
-            {
-                return part.Inventory.GetInventoryFileName(remoteClient, localID);
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[PRIM INVENTORY]: " +
-                    "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
-                    localID, Name, UUID);
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Return serialized inventory metadata for the given constituent prim
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="xferManager"></param>
-        public void RequestInventoryFile(IClientAPI client, uint localID, IXfer xferManager)
-        {
-            SceneObjectPart part = GetChildPart(localID);
-            if (part != null)
-            {
-                part.Inventory.RequestInventoryFile(client, xferManager);
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[PRIM INVENTORY]: " +
-                    "Couldn't find part {0} in object group {1}, {2} to request inventory data",
-                    localID, Name, UUID);
-            }
-        }
-
-        /// <summary>
         /// Add an inventory item to a prim in this group.
         /// </summary>
         /// <param name="remoteClient"></param>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 8fcfcc5..9412e09 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -46,7 +46,8 @@ namespace OpenSim.Region.Framework.Scenes
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_inventoryFileName = String.Empty;
-        private int m_inventoryFileNameSerial = 0;
+        private byte[] m_inventoryFileData = new byte[0];
+        private uint m_inventoryFileNameSerial = 0;
 
         private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
         
@@ -930,39 +931,17 @@ namespace OpenSim.Region.Framework.Scenes
             return -1;
         }
 
-        public string GetInventoryFileName()
+        private bool CreateInventoryFileName()
         {
-            if (m_inventoryFileName == String.Empty)
-                m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
-            if (m_inventoryFileNameSerial < m_inventorySerial)
+            if (m_inventoryFileName == String.Empty ||
+                m_inventoryFileNameSerial < m_inventorySerial)
             {
                 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
-            }
-            return m_inventoryFileName;
-        }
-
-        /// <summary>
-        /// Return the name with which a client can request a xfer of this prim's inventory metadata
-        /// </summary>
-        /// <param name="client"></param>
-        /// <param name="localID"></param>
-        public bool GetInventoryFileName(IClientAPI client, uint localID)
-        {
-//            m_log.DebugFormat(
-//                 "[PRIM INVENTORY]: Received request from client {0} for inventory file name of {1}, {2}",
-//                 client.AgentId, Name, UUID);
-
-            if (m_inventorySerial > 0)
-            {
-                client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
-                                         Utils.StringToBytes(GetInventoryFileName()));
+                m_inventoryFileNameSerial = m_inventorySerial;
                 return true;
             }
-            else
-            {
-                client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
-                return false;
-            }
+
+            return false;
         }
 
         /// <summary>
@@ -971,78 +950,92 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="xferManager"></param>
         public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
         {
-            byte[] fileData = new byte[0];
+            bool changed = CreateInventoryFileName();
 
-            // Confusingly, the folder item has to be the object id, while the 'parent id' has to be zero.  This matches
-            // what appears to happen in the Second Life protocol.  If this isn't the case. then various functionality
-            // isn't available (such as drag from prim inventory to agent inventory)
             InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
 
+            Items.LockItemsForRead(true);
+
+            if (m_inventorySerial == 0) // No inventory
+            {
+                client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
+                Items.LockItemsForRead(false);
+                return;
+            }
+
+            client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
+                    Util.StringToBytes256(m_inventoryFileName));
+
+            if (!changed)
+            {
+                if (m_inventoryFileData.Length > 2)
+                {
+                    xferManager.AddNewFile(m_inventoryFileName,
+                            m_inventoryFileData);
+                    Items.LockItemsForRead(false);
+                    return;
+                }
+            }
+
             bool includeAssets = false;
             if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
                 includeAssets = true;
 
-            lock (m_items)
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
-                {
-                    UUID ownerID = item.OwnerID;
-                    uint everyoneMask = 0;
-                    uint baseMask = item.BasePermissions;
-                    uint ownerMask = item.CurrentPermissions;
-                    uint groupMask = item.GroupPermissions;
-
-                    invString.AddItemStart();
-                    invString.AddNameValueLine("item_id", item.ItemID.ToString());
-                    invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
-
-                    invString.AddPermissionsStart();
-
-                    invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
-                    invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
-                    invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
-                    invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
-                    invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
-
-                    invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
-                    invString.AddNameValueLine("owner_id", ownerID.ToString());
-
-                    invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
-
-                    invString.AddNameValueLine("group_id", item.GroupID.ToString());
-                    invString.AddSectionEnd();
-
-                    if (includeAssets)
-                        invString.AddNameValueLine("asset_id", item.AssetID.ToString());
-                    else
-                        invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
-                    invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
-                    invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
-                    invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
-
-                    invString.AddSaleStart();
-                    invString.AddNameValueLine("sale_type", "not");
-                    invString.AddNameValueLine("sale_price", "0");
-                    invString.AddSectionEnd();
-
-                    invString.AddNameValueLine("name", item.Name + "|");
-                    invString.AddNameValueLine("desc", item.Description + "|");
-
-                    invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
-                    invString.AddSectionEnd();
-                }
+                UUID ownerID = item.OwnerID;
+                uint everyoneMask = 0;
+                uint baseMask = item.BasePermissions;
+                uint ownerMask = item.CurrentPermissions;
+                uint groupMask = item.GroupPermissions;
+
+                invString.AddItemStart();
+                invString.AddNameValueLine("item_id", item.ItemID.ToString());
+                invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
+
+                invString.AddPermissionsStart();
+
+                invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
+                invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
+                invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
+                invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
+                invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
+
+                invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
+                invString.AddNameValueLine("owner_id", ownerID.ToString());
+
+                invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
+
+                invString.AddNameValueLine("group_id", item.GroupID.ToString());
+                invString.AddSectionEnd();
+
+                if (includeAssets)
+                    invString.AddNameValueLine("asset_id", item.AssetID.ToString());
+                else
+                    invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
+                invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
+                invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
+                invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
+
+                invString.AddSaleStart();
+                invString.AddNameValueLine("sale_type", "not");
+                invString.AddNameValueLine("sale_price", "0");
+                invString.AddSectionEnd();
+
+                invString.AddNameValueLine("name", item.Name + "|");
+                invString.AddNameValueLine("desc", item.Description + "|");
+
+                invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
+                invString.AddSectionEnd();
             }
-            int count = m_items.Count;
-            m_items.LockItemsForRead(false);
 
-            fileData = Utils.StringToBytes(invString.BuildString);
+            Items.LockItemsForRead(false);
 
-            //m_log.Debug(Utils.BytesToString(fileData));
-            //m_log.Debug("[PRIM INVENTORY]: RequestInventoryFile fileData: " + Utils.BytesToString(fileData));
+            m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
 
-            if (fileData.Length > 2)
+            if (m_inventoryFileData.Length > 2)
             {
-                xferManager.AddNewFile(m_inventoryFileName, fileData);
+                xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index b44a010..40a73a9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.Scenes
                         g.ScheduleFullUpdateToAvatar(m_presence);
                 }
 
-                while (m_partsUpdateQueue.Count > 0)
+                while (m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
                 {
                     SceneObjectPart part = m_partsUpdateQueue.Dequeue();