Merging Opensim upstream before generating patch

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index 7049902..59655eb 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.cs
@@ -37,6 +37,8 @@ namespace OpenSim.Framework
     {
         public List<InventoryFolderBase> Folders;
         public List<InventoryItemBase> Items;
-        public UUID UserID;
+        public UUID OwnerID;
+        public UUID FolderID;
+        public int Version;
     }
 }