Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-12-21 22:57:31 +00:00
commit a70b597840
1 changed files with 1 additions and 0 deletions

View File

@ -937,6 +937,7 @@ namespace OpenSim.Region.Framework.Scenes
m_inventoryFileNameSerial < m_inventorySerial) m_inventoryFileNameSerial < m_inventorySerial)
{ {
m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp"; m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
m_inventoryFileNameSerial = m_inventorySerial;
return true; return true;
} }