diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 0444685..a9dc9cf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | private string m_inventoryFileName = String.Empty; | 44 | private string m_inventoryFileName = String.Empty; |
45 | private int m_inventoryFileNameSerial = 0; | 45 | private int m_inventoryFileNameSerial = 0; |
46 | 46 | ||
47 | /// <summary> | 47 | /// <summary> |
48 | /// Exposing this is not particularly good, but it's one of the least evils at the moment to see | 48 | /// Exposing this is not particularly good, but it's one of the least evils at the moment to see |
@@ -445,16 +445,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
445 | return -1; | 445 | return -1; |
446 | } | 446 | } |
447 | 447 | ||
448 | public string GetInventoryFileName() | 448 | public string GetInventoryFileName() |
449 | { | 449 | { |
450 | if(m_inventoryFileName == String.Empty) | 450 | if (m_inventoryFileName == String.Empty) |
451 | m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; | 451 | m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; |
452 | if(m_inventoryFileNameSerial < m_inventorySerial) | 452 | if (m_inventoryFileNameSerial < m_inventorySerial) |
453 | { | 453 | { |
454 | m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; | 454 | m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; |
455 | } | 455 | } |
456 | return m_inventoryFileName; | 456 | return m_inventoryFileName; |
457 | } | 457 | } |
458 | 458 | ||
459 | /// <summary> | 459 | /// <summary> |
460 | /// Return the name with which a client can request a xfer of this prim's inventory metadata | 460 | /// Return the name with which a client can request a xfer of this prim's inventory metadata |