From 7aa54593e0b6672979feec97b8151ed134388723 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 12 Aug 2009 20:39:48 -0700
Subject: Redirected all calls to CachedUserProfile methods to the inventory
 service. Redirection of the RootFolder property is still todo. This compiles
 but probably inventory will be inconsistent.

---
 OpenSim/Framework/InventoryItemBase.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/InventoryItemBase.cs')

diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 4307fe2..b5bf92f 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -354,7 +354,16 @@ namespace OpenSim.Framework
             }
         }
         protected int m_creationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-        
+
+        public InventoryItemBase()
+        {
+        }
+
+        public InventoryItemBase(UUID id)
+        {
+            ID = id;
+        }
+
         public object Clone()
         {
             return MemberwiseClone();
-- 
cgit v1.1


From 50056871b89be654a77310ac8cb49995dd1ee5f6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 16 Aug 2009 19:35:14 -0700
Subject: IAvatarFactory.UpdateDatabase gets the assetID and not the object's
 inworld UUID.

---
 OpenSim/Framework/InventoryItemBase.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Framework/InventoryItemBase.cs')

diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index b5bf92f..7150c82 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -364,6 +364,12 @@ namespace OpenSim.Framework
             ID = id;
         }
 
+        public InventoryItemBase(UUID id, UUID owner)
+        {
+            ID = id;
+            Owner = owner;
+        }
+
         public object Clone()
         {
             return MemberwiseClone();
-- 
cgit v1.1