aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/TaskInventoryItem.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/TaskInventoryItem.cs')
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs50
1 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index fc84041..60b22db 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -31,7 +31,7 @@ using System.Reflection;
31using System.Xml; 31using System.Xml;
32using System.Xml.Schema; 32using System.Xml.Schema;
33using System.Xml.Serialization; 33using System.Xml.Serialization;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36 36
37namespace OpenSim.Framework 37namespace OpenSim.Framework
@@ -41,7 +41,7 @@ namespace OpenSim.Framework
41 /// 41 ///
42 /// This class is not thread safe. Callers must synchronize on Dictionary methods. 42 /// This class is not thread safe. Callers must synchronize on Dictionary methods.
43 /// </summary> 43 /// </summary>
44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, 44 public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>,
45 ICloneable, IXmlSerializable 45 ICloneable, IXmlSerializable
46 { 46 {
47 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -56,7 +56,7 @@ namespace OpenSim.Framework
56 56
57 lock (this) 57 lock (this)
58 { 58 {
59 foreach (LLUUID uuid in Keys) 59 foreach (UUID uuid in Keys)
60 { 60 {
61 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone()); 61 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
62 } 62 }
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
76 // at System.Xml.Serialization.TypeTranslator.GetTypeData (System.Type runtimeType, System.String xmlDataType) [0x001f6] in /build/buildd/mono-1.2.4/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs:217 76 // at System.Xml.Serialization.TypeTranslator.GetTypeData (System.Type runtimeType, System.String xmlDataType) [0x001f6] in /build/buildd/mono-1.2.4/mcs/class/System.XML/System.Xml.Serialization/TypeTranslator.cs:217
77 // ... 77 // ...
78// private static XmlSerializer tiiSerializer 78// private static XmlSerializer tiiSerializer
79// = new XmlSerializer(typeof(Dictionary<LLUUID, TaskInventoryItem>.ValueCollection)); 79// = new XmlSerializer(typeof(Dictionary<UUID, TaskInventoryItem>.ValueCollection));
80 80
81 // see IXmlSerializable 81 // see IXmlSerializable
82 82
@@ -203,31 +203,31 @@ namespace OpenSim.Framework
203 "gesture" 203 "gesture"
204 }; 204 };
205 205
206 private LLUUID _assetID = LLUUID.Zero; 206 private UUID _assetID = UUID.Zero;
207 207
208 private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL; 208 private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL;
209 private uint _creationDate = 0; 209 private uint _creationDate = 0;
210 private LLUUID _creatorID = LLUUID.Zero; 210 private UUID _creatorID = UUID.Zero;
211 private string _description = String.Empty; 211 private string _description = String.Empty;
212 private uint _everyoneMask = FULL_MASK_PERMISSIONS_GENERAL; 212 private uint _everyoneMask = FULL_MASK_PERMISSIONS_GENERAL;
213 private uint _flags = 0; 213 private uint _flags = 0;
214 private LLUUID _groupID = LLUUID.Zero; 214 private UUID _groupID = UUID.Zero;
215 private uint _groupMask = FULL_MASK_PERMISSIONS_GENERAL; 215 private uint _groupMask = FULL_MASK_PERMISSIONS_GENERAL;
216 216
217 private int _invType = 0; 217 private int _invType = 0;
218 private LLUUID _itemID = LLUUID.Zero; 218 private UUID _itemID = UUID.Zero;
219 private LLUUID _lastOwnerID = LLUUID.Zero; 219 private UUID _lastOwnerID = UUID.Zero;
220 private string _name = String.Empty; 220 private string _name = String.Empty;
221 private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL; 221 private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL;
222 private LLUUID _ownerID = LLUUID.Zero; 222 private UUID _ownerID = UUID.Zero;
223 private uint _ownerMask = FULL_MASK_PERMISSIONS_GENERAL; 223 private uint _ownerMask = FULL_MASK_PERMISSIONS_GENERAL;
224 private LLUUID _parentID = LLUUID.Zero; //parent folder id 224 private UUID _parentID = UUID.Zero; //parent folder id
225 private LLUUID _parentPartID = LLUUID.Zero; // SceneObjectPart this is inside 225 private UUID _parentPartID = UUID.Zero; // SceneObjectPart this is inside
226 private LLUUID _permsGranter; 226 private UUID _permsGranter;
227 private int _permsMask; 227 private int _permsMask;
228 private int _type = 0; 228 private int _type = 0;
229 229
230 public LLUUID AssetID { 230 public UUID AssetID {
231 get { 231 get {
232 return _assetID; 232 return _assetID;
233 } 233 }
@@ -254,7 +254,7 @@ namespace OpenSim.Framework
254 } 254 }
255 } 255 }
256 256
257 public LLUUID CreatorID { 257 public UUID CreatorID {
258 get { 258 get {
259 return _creatorID; 259 return _creatorID;
260 } 260 }
@@ -290,7 +290,7 @@ namespace OpenSim.Framework
290 } 290 }
291 } 291 }
292 292
293 public LLUUID GroupID { 293 public UUID GroupID {
294 get { 294 get {
295 return _groupID; 295 return _groupID;
296 } 296 }
@@ -317,7 +317,7 @@ namespace OpenSim.Framework
317 } 317 }
318 } 318 }
319 319
320 public LLUUID ItemID { 320 public UUID ItemID {
321 get { 321 get {
322 return _itemID; 322 return _itemID;
323 } 323 }
@@ -326,7 +326,7 @@ namespace OpenSim.Framework
326 } 326 }
327 } 327 }
328 328
329 public LLUUID LastOwnerID { 329 public UUID LastOwnerID {
330 get { 330 get {
331 return _lastOwnerID; 331 return _lastOwnerID;
332 } 332 }
@@ -353,7 +353,7 @@ namespace OpenSim.Framework
353 } 353 }
354 } 354 }
355 355
356 public LLUUID OwnerID { 356 public UUID OwnerID {
357 get { 357 get {
358 return _ownerID; 358 return _ownerID;
359 } 359 }
@@ -371,7 +371,7 @@ namespace OpenSim.Framework
371 } 371 }
372 } 372 }
373 373
374 public LLUUID ParentID { 374 public UUID ParentID {
375 get { 375 get {
376 return _parentID; 376 return _parentID;
377 } 377 }
@@ -380,7 +380,7 @@ namespace OpenSim.Framework
380 } 380 }
381 } 381 }
382 382
383 public LLUUID ParentPartID { 383 public UUID ParentPartID {
384 get { 384 get {
385 return _parentPartID; 385 return _parentPartID;
386 } 386 }
@@ -389,7 +389,7 @@ namespace OpenSim.Framework
389 } 389 }
390 } 390 }
391 391
392 public LLUUID PermsGranter { 392 public UUID PermsGranter {
393 get { 393 get {
394 return _permsGranter; 394 return _permsGranter;
395 } 395 }
@@ -428,12 +428,12 @@ namespace OpenSim.Framework
428 #endregion 428 #endregion
429 429
430 /// <summary> 430 /// <summary>
431 /// Reset the LLUUIDs for this item. 431 /// Reset the UUIDs for this item.
432 /// </summary> 432 /// </summary>
433 /// <param name="partID">The new part ID to which this item belongs</param> 433 /// <param name="partID">The new part ID to which this item belongs</param>
434 public void ResetIDs(LLUUID partID) 434 public void ResetIDs(UUID partID)
435 { 435 {
436 _itemID = LLUUID.Random(); 436 _itemID = UUID.Random();
437 _parentPartID = partID; 437 _parentPartID = partID;
438 } 438 }
439 } 439 }