aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
diff options
context:
space:
mode:
authorJeff Ames2008-05-17 00:06:35 +0000
committerJeff Ames2008-05-17 00:06:35 +0000
commita5f08b430d644c7a4274db9fff3db0c63a6a7857 (patch)
tree4216400d14b587763167839344d61c0a6f6d8c85 /OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
parent* Committing patch from mantis 0001297: [PATCH] Fix behavior of child prim in... (diff)
downloadopensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.zip
opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.gz
opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.bz2
opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs22
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