diff options
author | Mike Mazur | 2009-03-05 08:29:52 +0000 |
---|---|---|
committer | Mike Mazur | 2009-03-05 08:29:52 +0000 |
commit | 367606227774c4551a8929b2b42f8d014efff318 (patch) | |
tree | f4d9bfe81c36c62a1c62bef29f95835aa61ffa0f /OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs | |
parent | A couple cosmetic changes in inventory storage plugin. (diff) | |
download | opensim-SC_OLD-367606227774c4551a8929b2b42f8d014efff318.zip opensim-SC_OLD-367606227774c4551a8929b2b42f8d014efff318.tar.gz opensim-SC_OLD-367606227774c4551a8929b2b42f8d014efff318.tar.bz2 opensim-SC_OLD-367606227774c4551a8929b2b42f8d014efff318.tar.xz |
Use Inventory{Item,Folder}Base in AssetInventoryServer.
Also the first inventory storage methods are implemented.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs | 123 |
1 files changed, 65 insertions, 58 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs index 7392f1d..5fa4274 100644 --- a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs +++ b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs | |||
@@ -28,78 +28,85 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenSim.Framework; | ||
31 | 32 | ||
32 | namespace OpenSim.Grid.AssetInventoryServer | 33 | namespace OpenSim.Grid.AssetInventoryServer |
33 | { | 34 | { |
34 | public class InventoryBase | 35 | //public class InventoryBase |
35 | { | 36 | //{ |
36 | } | 37 | //} |
37 | 38 | ||
38 | public class InventoryFolder : InventoryBase | 39 | //public class InventoryFolder : InventoryBase |
39 | { | 40 | //{ |
40 | public string Name; | 41 | // public string Name; |
41 | public UUID Owner; | 42 | // public UUID Owner; |
42 | public UUID ParentID; | 43 | // public UUID ParentID; |
43 | public UUID ID; | 44 | // public UUID ID; |
44 | public short Type; | 45 | // public short Type; |
45 | public ushort Version; | 46 | // public ushort Version; |
46 | 47 | ||
47 | [NonSerialized] | 48 | // [NonSerialized] |
48 | public Dictionary<UUID, InventoryBase> Children = new Dictionary<UUID, InventoryBase>(); | 49 | // public Dictionary<UUID, InventoryBase> Children = new Dictionary<UUID, InventoryBase>(); |
49 | 50 | ||
50 | public InventoryFolder() | 51 | // public InventoryFolder() |
51 | { | 52 | // { |
52 | } | 53 | // } |
53 | 54 | ||
54 | public InventoryFolder(string name, UUID ownerID, UUID parentID, short assetType) | 55 | // public InventoryFolder(string name, UUID ownerID, UUID parentID, short assetType) |
55 | { | 56 | // { |
56 | ID = UUID.Random(); | 57 | // ID = UUID.Random(); |
57 | Name = name; | 58 | // Name = name; |
58 | Owner = ownerID; | 59 | // Owner = ownerID; |
59 | ParentID = parentID; | 60 | // ParentID = parentID; |
60 | Type = assetType; | 61 | // Type = assetType; |
61 | Version = 1; | 62 | // Version = 1; |
62 | } | 63 | // } |
63 | 64 | ||
64 | public override string ToString() | 65 | // public override string ToString() |
65 | { | 66 | // { |
66 | return String.Format("{0} ({1})", Name, ID); | 67 | // return String.Format("{0} ({1})", Name, ID); |
67 | } | 68 | // } |
68 | } | 69 | //} |
69 | 70 | ||
70 | public class InventoryItem : InventoryBase | 71 | //public class InventoryItem : InventoryBase |
71 | { | 72 | //{ |
72 | public UUID ID; | 73 | // public UUID ID; |
73 | public int InvType; | 74 | // public int InvType; |
74 | public UUID Folder; | 75 | // public UUID Folder; |
75 | public UUID Owner; | 76 | // public UUID Owner; |
76 | public UUID Creator; | 77 | // public UUID Creator; |
77 | public string Name; | 78 | // public string Name; |
78 | public string Description; | 79 | // public string Description; |
79 | public uint NextPermissions; | 80 | // public uint NextPermissions; |
80 | public uint CurrentPermissions; | 81 | // public uint CurrentPermissions; |
81 | public uint BasePermissions; | 82 | // public uint BasePermissions; |
82 | public uint EveryOnePermissions; | 83 | // public uint EveryOnePermissions; |
83 | public uint GroupPermissions; | 84 | // public uint GroupPermissions; |
84 | public int AssetType; | 85 | // public int AssetType; |
85 | public UUID AssetID; | 86 | // public UUID AssetID; |
86 | public UUID GroupID; | 87 | // public UUID GroupID; |
87 | public bool GroupOwned; | 88 | // public bool GroupOwned; |
88 | public int SalePrice; | 89 | // public int SalePrice; |
89 | public byte SaleType; | 90 | // public byte SaleType; |
90 | public uint Flags; | 91 | // public uint Flags; |
91 | public int CreationDate; | 92 | // public int CreationDate; |
93 | |||
94 | // public override string ToString() | ||
95 | // { | ||
96 | // return String.Format("{0} ({1})", Name, ID); | ||
97 | // } | ||
98 | //} | ||
92 | 99 | ||
93 | public override string ToString() | 100 | public class InventoryFolderWithChildren : InventoryFolderBase |
94 | { | 101 | { |
95 | return String.Format("{0} ({1})", Name, ID); | 102 | [NonSerialized] |
96 | } | 103 | public Dictionary<UUID, InventoryNodeBase> Children = new Dictionary<UUID, InventoryNodeBase>(); |
97 | } | 104 | } |
98 | 105 | ||
99 | public class InventoryCollection | 106 | public class InventoryCollection |
100 | { | 107 | { |
101 | public Dictionary<UUID, InventoryFolder> Folders; | 108 | public Dictionary<UUID, InventoryFolderWithChildren> Folders; |
102 | public Dictionary<UUID, InventoryItem> Items; | 109 | public Dictionary<UUID, InventoryItemBase> Items; |
103 | public UUID UserID; | 110 | public UUID UserID; |
104 | } | 111 | } |
105 | } | 112 | } |