aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs16
-rw-r--r--OpenSim/Framework/PacketPool.cs2
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 6c54924..74b504e 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
55 { 55 {
56 m_creatorId = value; 56 m_creatorId = value;
57 UUID creatorIdAsUuid; 57 UUID creatorIdAsUuid;
58 58
59 // For now, all IDs are UUIDs 59 // For now, all IDs are UUIDs
60 UUID.TryParse(m_creatorId, out creatorIdAsUuid); 60 UUID.TryParse(m_creatorId, out creatorIdAsUuid);
61 CreatorIdAsUuid = creatorIdAsUuid; 61 CreatorIdAsUuid = creatorIdAsUuid;
@@ -63,7 +63,7 @@ namespace OpenSim.Framework
63 } 63 }
64 64
65 private string m_creatorId = String.Empty; 65 private string m_creatorId = String.Empty;
66 66
67 /// <value> 67 /// <value>
68 /// The creator of this item expressed as a UUID 68 /// The creator of this item expressed as a UUID
69 /// </value> 69 /// </value>
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
105 /// 105 ///
106 /// </value> 106 /// </value>
107 public uint EveryOnePermissions; 107 public uint EveryOnePermissions;
108 108
109 /// <value> 109 /// <value>
110 /// 110 ///
111 /// </value> 111 /// </value>
@@ -150,10 +150,10 @@ namespace OpenSim.Framework
150 /// 150 ///
151 /// </value> 151 /// </value>
152 public int CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; 152 public int CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
153 153
154 public object Clone() 154 public object Clone()
155 { 155 {
156 return MemberwiseClone(); 156 return MemberwiseClone();
157 } 157 }
158 } 158 }
159} 159}
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 37924d7..76e48e5 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Framework
210 210
211 public static T GetDataBlock<T>() where T: new() 211 public static T GetDataBlock<T>() where T: new()
212 { 212 {
213 lock(DataBlocks) 213 lock (DataBlocks)
214 { 214 {
215 if (DataBlocks.ContainsKey(typeof(T)) && DataBlocks[typeof(T)].Count > 0) 215 if (DataBlocks.ContainsKey(typeof(T)) && DataBlocks[typeof(T)].Count > 0)
216 { 216 {