diff options
author | Justin Clark-Casey (justincc) | 2011-09-15 18:42:10 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-15 18:42:10 +0100 |
commit | a4cc5f628f053ad1f9f849addf79551cd58e9337 (patch) | |
tree | 9bc6febd3372bc04b484961cb4322c724f6e2d96 /OpenSim | |
parent | Shuffle order of code in invnetory connector GetFolderContent() calls to avoi... (diff) | |
download | opensim-SC-a4cc5f628f053ad1f9f849addf79551cd58e9337.zip opensim-SC-a4cc5f628f053ad1f9f849addf79551cd58e9337.tar.gz opensim-SC-a4cc5f628f053ad1f9f849addf79551cd58e9337.tar.bz2 opensim-SC-a4cc5f628f053ad1f9f849addf79551cd58e9337.tar.xz |
Only bother to create an inventory xfer file if there are any items in a prim inventory
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 6085f1e..d63b411 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -866,8 +866,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
866 | { | 866 | { |
867 | lock (m_items) | 867 | lock (m_items) |
868 | { | 868 | { |
869 | CreateInventoryFile(); | ||
870 | |||
871 | // Don't send a inventory xfer name if there are no items. Doing so causes viewer 3 to crash when rezzing | 869 | // Don't send a inventory xfer name if there are no items. Doing so causes viewer 3 to crash when rezzing |
872 | // a new script if any previous deletion has left the prim inventory empty. | 870 | // a new script if any previous deletion has left the prim inventory empty. |
873 | if (m_items.Count == 0) // No inventory | 871 | if (m_items.Count == 0) // No inventory |
@@ -879,6 +877,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
879 | client.SendTaskInventory(m_part.UUID, 0, new byte[0]); | 877 | client.SendTaskInventory(m_part.UUID, 0, new byte[0]); |
880 | return; | 878 | return; |
881 | } | 879 | } |
880 | |||
881 | CreateInventoryFile(); | ||
882 | 882 | ||
883 | // In principle, we should only do the rest if the inventory changed; | 883 | // In principle, we should only do the rest if the inventory changed; |
884 | // by sending m_inventorySerial to the client, it ought to know | 884 | // by sending m_inventorySerial to the client, it ought to know |