Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-21 22:50:35 +00:00

View File

@@ -970,6 +970,7 @@ namespace OpenSim.Region.Framework.Scenes
{
xferManager.AddNewFile(m_inventoryFileName,
m_inventoryFileData);
return;
}
}