Merge branch 'master' into careminster-presence-refactor

2010-12-21 22:50:35 +00:00 · 2010-12-21 22:50:35 +00:00 · da37ddff9f
parent 4093e22833 ec8d1d0131
commit da37ddff9f
1 changed files with 1 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@ -970,6 +970,7 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    xferManager.AddNewFile(m_inventoryFileName,
                            m_inventoryFileData);
+                    return;
                }
            }