aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General/AgentInventory.cs
diff options
context:
space:
mode:
authorMW2007-07-19 20:21:02 +0000
committerMW2007-07-19 20:21:02 +0000
commitb2c6f316e16e9bb33f81997319a4130fa683bc48 (patch)
tree632f901a43267c2f3a7c0de8feff2e4ddc845275 /OpenSim/Framework/General/AgentInventory.cs
parent*Handler Functions can now refuse an object as invalid by returning false, th... (diff)
downloadopensim-SC-b2c6f316e16e9bb33f81997319a4130fa683bc48.zip
opensim-SC-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.gz
opensim-SC-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.bz2
opensim-SC-b2c6f316e16e9bb33f81997319a4130fa683bc48.tar.xz
Some work on Inventory (not yet finished or enabled)
Diffstat (limited to 'OpenSim/Framework/General/AgentInventory.cs')
-rw-r--r--OpenSim/Framework/General/AgentInventory.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index 0aeb0b3..4c80791 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
@@ -52,12 +52,11 @@ namespace OpenSim.Framework.Inventory
52 52
53 public virtual void Initialise() 53 public virtual void Initialise()
54 { 54 {
55 Wearables = new AvatarWearable[13]; //should be 12 of these 55 Wearables = new AvatarWearable[13];
56 for (int i = 0; i < 13; i++) 56 for (int i = 0; i < 13; i++)
57 { 57 {
58 Wearables[i] = new AvatarWearable(); 58 Wearables[i] = new AvatarWearable();
59 } 59 }
60
61 } 60 }
62 61
63 public bool CreateNewFolder(LLUUID folderID, ushort type) 62 public bool CreateNewFolder(LLUUID folderID, ushort type)
@@ -96,11 +95,10 @@ namespace OpenSim.Framework.Inventory
96 Folder.DefaultType = type; 95 Folder.DefaultType = type;
97 Folder.FolderName = folderName; 96 Folder.FolderName = folderName;
98 this.InventoryFolders.Add(Folder.FolderID, Folder); 97 this.InventoryFolders.Add(Folder.FolderID, Folder);
99
100 return (true); 98 return (true);
101 } 99 }
102 100
103 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent) 101 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parentID)
104 { 102 {
105 if (!this.InventoryFolders.ContainsKey(folderID)) 103 if (!this.InventoryFolders.ContainsKey(folderID))
106 { 104 {
@@ -110,10 +108,9 @@ namespace OpenSim.Framework.Inventory
110 Folder.OwnerID = this.AgentID; 108 Folder.OwnerID = this.AgentID;
111 Folder.DefaultType = type; 109 Folder.DefaultType = type;
112 Folder.FolderName = folderName; 110 Folder.FolderName = folderName;
113 Folder.ParentID = parent; 111 Folder.ParentID = parentID;
114 this.InventoryFolders.Add(Folder.FolderID, Folder); 112 this.InventoryFolders.Add(Folder.FolderID, Folder);
115 } 113 }
116
117 return (true); 114 return (true);
118 } 115 }
119 116
@@ -135,7 +132,6 @@ namespace OpenSim.Framework.Inventory
135 return inv.FolderID; 132 return inv.FolderID;
136 } 133 }
137 } 134 }
138
139 return LLUUID.Zero; 135 return LLUUID.Zero;
140 } 136 }
141 137