Merge branch 'master' into careminster-presence-refactor

1 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 9412e09..3cfca4b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -963,15 +963,15 @@ namespace OpenSim.Region.Framework.Scenes
                 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);
+                    client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
+                            Util.StringToBytes256(m_inventoryFileName));
+
                     Items.LockItemsForRead(false);
                     return;
                 }
@@ -1037,6 +1037,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
             }
+
+            client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
+                    Util.StringToBytes256(m_inventoryFileName));
         }
 
         /// <summary>