diff options
| author | Melanie | 2010-12-21 22:57:31 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-21 22:57:31 +0000 |
| commit | a70b5978404acfab73f58ea90e7b4f24ee08e1e1 (patch) | |
| tree | e552b7325b2950d573faeecf7fcb0bb21c3326d5 | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Another good catch. Update file name serial. (diff) | |
| download | opensim-SC-a70b5978404acfab73f58ea90e7b4f24ee08e1e1.zip opensim-SC-a70b5978404acfab73f58ea90e7b4f24ee08e1e1.tar.gz opensim-SC-a70b5978404acfab73f58ea90e7b4f24ee08e1e1.tar.bz2 opensim-SC-a70b5978404acfab73f58ea90e7b4f24ee08e1e1.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 9be7211..f7896cf 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -937,6 +937,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 937 | m_inventoryFileNameSerial < m_inventorySerial) | 937 | m_inventoryFileNameSerial < m_inventorySerial) |
| 938 | { | 938 | { |
| 939 | m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp"; | 939 | m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp"; |
| 940 | m_inventoryFileNameSerial = m_inventorySerial; | ||
| 940 | return true; | 941 | return true; |
| 941 | } | 942 | } |
| 942 | 943 | ||