Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-21 22:57:31 +00:00

View File

@@ -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;
}