diff options
author | gareth | 2007-04-14 12:48:38 +0000 |
---|---|---|
committer | gareth | 2007-04-14 12:48:38 +0000 |
commit | ba7aeb1479e2df2e376242bc8e22da5931c1354b (patch) | |
tree | ee5de07d15350565f70c3f9751a9ec9059457cac /OpenSim.Framework/AgentInventory.cs | |
parent | Fixed weird XML/HTTP bugs (diff) | |
download | opensim-SC-ba7aeb1479e2df2e376242bc8e22da5931c1354b.zip opensim-SC-ba7aeb1479e2df2e376242bc8e22da5931c1354b.tar.gz opensim-SC-ba7aeb1479e2df2e376242bc8e22da5931c1354b.tar.bz2 opensim-SC-ba7aeb1479e2df2e376242bc8e22da5931c1354b.tar.xz |
In the grid, there is life!
OGS now functional again, can login! w00t
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Framework/AgentInventory.cs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs index 9919ec3..f715129 100644 --- a/OpenSim.Framework/AgentInventory.cs +++ b/OpenSim.Framework/AgentInventory.cs | |||
@@ -12,7 +12,7 @@ namespace OpenSim.Framework.Inventory | |||
12 | //Holds the local copy of Inventory info for a agent | 12 | //Holds the local copy of Inventory info for a agent |
13 | public Dictionary<LLUUID, InventoryFolder> InventoryFolders; | 13 | public Dictionary<LLUUID, InventoryFolder> InventoryFolders; |
14 | public Dictionary<LLUUID, InventoryItem> InventoryItems; | 14 | public Dictionary<LLUUID, InventoryItem> InventoryItems; |
15 | public InventoryFolder InventoryRoot = new InventoryFolder(); | 15 | public InventoryFolder InventoryRoot; |
16 | public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server | 16 | public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server |
17 | public LLUUID AgentID; | 17 | public LLUUID AgentID; |
18 | public AvatarWearable[] Wearables; | 18 | public AvatarWearable[] Wearables; |
@@ -31,15 +31,7 @@ namespace OpenSim.Framework.Inventory | |||
31 | { | 31 | { |
32 | Wearables[i] = new AvatarWearable(); | 32 | Wearables[i] = new AvatarWearable(); |
33 | } | 33 | } |
34 | 34 | ||
35 | InventoryRoot = new InventoryFolder(); | ||
36 | InventoryRoot.FolderID = LLUUID.Random(); | ||
37 | InventoryRoot.ParentID = LLUUID.Zero; | ||
38 | InventoryRoot.Version = 1; | ||
39 | InventoryRoot.DefaultType = 8; | ||
40 | InventoryRoot.OwnerID = this.AgentID; | ||
41 | InventoryRoot.FolderName = "My Inventory"; | ||
42 | InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); | ||
43 | } | 35 | } |
44 | 36 | ||
45 | public bool CreateNewFolder(LLUUID folderID, ushort type) | 37 | public bool CreateNewFolder(LLUUID folderID, ushort type) |
@@ -55,14 +47,14 @@ namespace OpenSim.Framework.Inventory | |||
55 | public void CreateRootFolder(LLUUID newAgentID, bool createTextures) | 47 | public void CreateRootFolder(LLUUID newAgentID, bool createTextures) |
56 | { | 48 | { |
57 | this.AgentID = newAgentID; | 49 | this.AgentID = newAgentID; |
58 | /* InventoryRoot = new InventoryFolder(); | 50 | InventoryRoot = new InventoryFolder(); |
59 | InventoryRoot.FolderID = LLUUID.Random(); | 51 | InventoryRoot.FolderID = LLUUID.Random(); |
60 | InventoryRoot.ParentID = new LLUUID(); | 52 | InventoryRoot.ParentID = new LLUUID(); |
61 | InventoryRoot.Version = 1; | 53 | InventoryRoot.Version = 1; |
62 | InventoryRoot.DefaultType = 8; | 54 | InventoryRoot.DefaultType = 8; |
63 | InventoryRoot.OwnerID = this.AgentID; | 55 | InventoryRoot.OwnerID = this.AgentID; |
64 | InventoryRoot.FolderName = "My Inventory-"; | 56 | InventoryRoot.FolderName = "My Inventory-"; |
65 | InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);*/ | 57 | InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); |
66 | InventoryRoot.OwnerID = this.AgentID; | 58 | InventoryRoot.OwnerID = this.AgentID; |
67 | if (createTextures) | 59 | if (createTextures) |
68 | { | 60 | { |