Merge branch 'master' into careminster-presence-refactor

2010-12-21 22:57:31 +00:00 · 2010-12-21 22:57:31 +00:00 · a70b597840
parent da37ddff9f 19181c019a
commit a70b597840
1 changed files with 1 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@ -937,6 +937,7 @@ namespace OpenSim.Region.Framework.Scenes
                m_inventoryFileNameSerial < m_inventorySerial)
            {
                m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
+                m_inventoryFileNameSerial = m_inventorySerial;
                return true;
            }