1 files changed, 107 insertions, 107 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
index 6f054ff..89398f7 100644
--- a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
+++ b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
@@ -1,107 +1,107 @@
-/*
+/*
- * Copyright (c) 2008 Intel Corporation
+ * Copyright (c) 2008 Intel Corporation
- * All rights reserved.
+ * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
+ * modification, are permitted provided that the following conditions
- * are met:
+ * are met:
- *
+ *
- * -- Redistributions of source code must retain the above copyright
+ * -- Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
+ *    notice, this list of conditions and the following disclaimer.
- * -- Redistributions in binary form must reproduce the above copyright
+ * -- Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ *    documentation and/or other materials provided with the distribution.
- * -- Neither the name of the Intel Corporation nor the names of its
+ * -- Neither the name of the Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived from
+ *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
+ *    this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE INTEL OR ITS
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE INTEL OR ITS
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenMetaverse;
+using OpenMetaverse;
-namespace OpenSim.Grid.AssetInventoryServer
+namespace OpenSim.Grid.AssetInventoryServer
-{
+{
-    public class InventoryBase
+    public class InventoryBase
-    {
+    {
-    }
+    }
-    public class InventoryFolder : InventoryBase
+    public class InventoryFolder : InventoryBase
-    {
+    {
-        public string Name;
+        public string Name;
-        public UUID Owner;
+        public UUID Owner;
-        public UUID ParentID;
+        public UUID ParentID;
-        public UUID ID;
+        public UUID ID;
-        public short Type;
+        public short Type;
-        public ushort Version;
+        public ushort Version;
-        [NonSerialized]
+        [NonSerialized]
-        public Dictionary<UUID, InventoryBase> Children = new Dictionary<UUID, InventoryBase>();
+        public Dictionary<UUID, InventoryBase> Children = new Dictionary<UUID, InventoryBase>();
-        public InventoryFolder()
+        public InventoryFolder()
-        {
+        {
-        }
+        }
-        public InventoryFolder(string name, UUID ownerID, UUID parentID, short assetType)
+        public InventoryFolder(string name, UUID ownerID, UUID parentID, short assetType)
-        {
+        {
-            ID = UUID.Random();
+            ID = UUID.Random();
-            Name = name;
+            Name = name;
-            Owner = ownerID;
+            Owner = ownerID;
-            ParentID = parentID;
+            ParentID = parentID;
-            Type = assetType;
+            Type = assetType;
-            Version = 1;
+            Version = 1;
-        }
+        }
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return String.Format("{0} ({1})", Name, ID);
+            return String.Format("{0} ({1})", Name, ID);
-        }
+        }
-    }
+    }
-    public class InventoryItem : InventoryBase
+    public class InventoryItem : InventoryBase
-    {
+    {
-        public UUID ID;
+        public UUID ID;
-        public int InvType;
+        public int InvType;
-        public UUID Folder;
+        public UUID Folder;
-        public UUID Owner;
+        public UUID Owner;
-        public UUID Creator;
+        public UUID Creator;
-        public string Name;
+        public string Name;
-        public string Description;
+        public string Description;
-        public uint NextPermissions;
+        public uint NextPermissions;
-        public uint CurrentPermissions;
+        public uint CurrentPermissions;
-        public uint BasePermissions;
+        public uint BasePermissions;
-        public uint EveryOnePermissions;
+        public uint EveryOnePermissions;
-        public uint GroupPermissions;
+        public uint GroupPermissions;
-        public int AssetType;
+        public int AssetType;
-        public UUID AssetID;
+        public UUID AssetID;
-        public UUID GroupID;
+        public UUID GroupID;
-        public bool GroupOwned;
+        public bool GroupOwned;
-        public int SalePrice;
+        public int SalePrice;
-        public byte SaleType;
+        public byte SaleType;
-        public uint Flags;
+        public uint Flags;
-        public int CreationDate;
+        public int CreationDate;
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return String.Format("{0} ({1})", Name, ID);
+            return String.Format("{0} ({1})", Name, ID);
-        }
+        }
-    }
+    }
-    public class InventoryCollection
+    public class InventoryCollection
-    {
+    {
-        public Dictionary<UUID, InventoryFolder> Folders;
+        public Dictionary<UUID, InventoryFolder> Folders;
-        public Dictionary<UUID, InventoryItem> Items;
+        public Dictionary<UUID, InventoryItem> Items;
-        public UUID UserID;
+        public UUID UserID;
-    }
+    }
-}
+}

diff --git a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs index 6f054ff..89398f7 100644 --- a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs +++ b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
@@ -1,107 +1,107 @@
1	/*	1	/*
2	* Copyright (c) 2008 Intel Corporation	2	* Copyright (c) 2008 Intel Corporation
3	* All rights reserved.	3	* All rights reserved.
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
6	* are met:	6	* are met:
7	*	7	*
8	* -- Redistributions of source code must retain the above copyright	8	* -- Redistributions of source code must retain the above copyright
9	* notice, this list of conditions and the following disclaimer.	9	* notice, this list of conditions and the following disclaimer.
10	* -- Redistributions in binary form must reproduce the above copyright	10	* -- Redistributions in binary form must reproduce the above copyright
11	* notice, this list of conditions and the following disclaimer in the	11	* notice, this list of conditions and the following disclaimer in the
12	* documentation and/or other materials provided with the distribution.	12	* documentation and/or other materials provided with the distribution.
13	* -- Neither the name of the Intel Corporation nor the names of its	13	* -- Neither the name of the Intel Corporation nor the names of its
14	* contributors may be used to endorse or promote products derived from	14	* contributors may be used to endorse or promote products derived from
15	* this software without specific prior written permission.	15	* this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS	17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18	* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT	18	* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A	19	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
20	* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS	20	* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS
21	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,	21	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
22	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,	22	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
23	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR	23	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
24	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF	24	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25	* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING	25	* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
26	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	26	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	27	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	*/	28	*/
29		29
30	using System;	30	using System;
31	using System.Collections.Generic;	31	using System.Collections.Generic;
32	using OpenMetaverse;	32	using OpenMetaverse;
33		33
34	namespace OpenSim.Grid.AssetInventoryServer	34	namespace OpenSim.Grid.AssetInventoryServer
35	{	35	{
36	public class InventoryBase	36	public class InventoryBase
37	{	37	{
38	}	38	}
39		39
40	public class InventoryFolder : InventoryBase	40	public class InventoryFolder : InventoryBase
41	{	41	{
42	public string Name;	42	public string Name;
43	public UUID Owner;	43	public UUID Owner;
44	public UUID ParentID;	44	public UUID ParentID;
45	public UUID ID;	45	public UUID ID;
46	public short Type;	46	public short Type;
47	public ushort Version;	47	public ushort Version;
48		48
49	[NonSerialized]	49	[NonSerialized]
50	public Dictionary<UUID, InventoryBase> Children = new Dictionary<UUID, InventoryBase>();	50	public Dictionary<UUID, InventoryBase> Children = new Dictionary<UUID, InventoryBase>();
51		51
52	public InventoryFolder()	52	public InventoryFolder()
53	{	53	{
54	}	54	}
55		55
56	public InventoryFolder(string name, UUID ownerID, UUID parentID, short assetType)	56	public InventoryFolder(string name, UUID ownerID, UUID parentID, short assetType)
57	{	57	{
58	ID = UUID.Random();	58	ID = UUID.Random();
59	Name = name;	59	Name = name;
60	Owner = ownerID;	60	Owner = ownerID;
61	ParentID = parentID;	61	ParentID = parentID;
62	Type = assetType;	62	Type = assetType;
63	Version = 1;	63	Version = 1;
64	}	64	}
65		65
66	public override string ToString()	66	public override string ToString()
67	{	67	{
68	return String.Format("{0} ({1})", Name, ID);	68	return String.Format("{0} ({1})", Name, ID);
69	}	69	}
70	}	70	}
71		71
72	public class InventoryItem : InventoryBase	72	public class InventoryItem : InventoryBase
73	{	73	{
74	public UUID ID;	74	public UUID ID;
75	public int InvType;	75	public int InvType;
76	public UUID Folder;	76	public UUID Folder;
77	public UUID Owner;	77	public UUID Owner;
78	public UUID Creator;	78	public UUID Creator;
79	public string Name;	79	public string Name;
80	public string Description;	80	public string Description;
81	public uint NextPermissions;	81	public uint NextPermissions;
82	public uint CurrentPermissions;	82	public uint CurrentPermissions;
83	public uint BasePermissions;	83	public uint BasePermissions;
84	public uint EveryOnePermissions;	84	public uint EveryOnePermissions;
85	public uint GroupPermissions;	85	public uint GroupPermissions;
86	public int AssetType;	86	public int AssetType;
87	public UUID AssetID;	87	public UUID AssetID;
88	public UUID GroupID;	88	public UUID GroupID;
89	public bool GroupOwned;	89	public bool GroupOwned;
90	public int SalePrice;	90	public int SalePrice;
91	public byte SaleType;	91	public byte SaleType;
92	public uint Flags;	92	public uint Flags;
93	public int CreationDate;	93	public int CreationDate;
94		94
95	public override string ToString()	95	public override string ToString()
96	{	96	{
97	return String.Format("{0} ({1})", Name, ID);	97	return String.Format("{0} ({1})", Name, ID);
98	}	98	}
99	}	99	}
100		100
101	public class InventoryCollection	101	public class InventoryCollection
102	{	102	{
103	public Dictionary<UUID, InventoryFolder> Folders;	103	public Dictionary<UUID, InventoryFolder> Folders;
104	public Dictionary<UUID, InventoryItem> Items;	104	public Dictionary<UUID, InventoryItem> Items;
105	public UUID UserID;	105	public UUID UserID;
106	}	106	}
107	}	107	}