aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AgentInventory.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-04-29 14:04:55 +0000
committerAdam Frisby2008-04-29 14:04:55 +0000
commit375163a6fece8b3a57c7555246abe8338223a599 (patch)
tree163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework/AgentInventory.cs
parentPatch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff)
downloadopensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.zip
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.gz
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.bz2
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.xz
* Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
Diffstat (limited to 'OpenSim/Framework/AgentInventory.cs')
-rw-r--r--OpenSim/Framework/AgentInventory.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index ef3ad16..61e8636 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
@@ -35,11 +35,11 @@ namespace OpenSim.Framework
35 public class AgentInventory 35 public class AgentInventory
36 { 36 {
37 //Holds the local copy of Inventory info for a agent 37 //Holds the local copy of Inventory info for a agent
38 public LLUUID AgentID;
38 public Dictionary<LLUUID, InventoryFolder> InventoryFolders; 39 public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
39 public Dictionary<LLUUID, InventoryItem> InventoryItems; 40 public Dictionary<LLUUID, InventoryItem> InventoryItems;
40 public InventoryFolder InventoryRoot; 41 public InventoryFolder InventoryRoot;
41 public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server 42 public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server
42 public LLUUID AgentID;
43 public AvatarWearable[] Wearables; 43 public AvatarWearable[] Wearables;
44 44
45 public AgentInventory() 45 public AgentInventory()
@@ -206,13 +206,13 @@ namespace OpenSim.Framework
206 206
207 public class InventoryFolder 207 public class InventoryFolder
208 { 208 {
209 public List<InventoryItem> Items;
210 //public List<InventoryFolder> Subfolders; 209 //public List<InventoryFolder> Subfolders;
210 public ushort DefaultType;
211 public LLUUID FolderID; 211 public LLUUID FolderID;
212 public string FolderName;
213 public List<InventoryItem> Items;
212 public LLUUID OwnerID; 214 public LLUUID OwnerID;
213 public LLUUID ParentID = LLUUID.Zero; 215 public LLUUID ParentID = LLUUID.Zero;
214 public string FolderName;
215 public ushort DefaultType;
216 public ushort Version; 216 public ushort Version;
217 217
218 public InventoryFolder() 218 public InventoryFolder()
@@ -224,15 +224,15 @@ namespace OpenSim.Framework
224 224
225 public class InventoryItem 225 public class InventoryItem
226 { 226 {
227 public LLUUID FolderID;
228 public LLUUID OwnerID;
229 public LLUUID ItemID;
230 public LLUUID AssetID; 227 public LLUUID AssetID;
231 public LLUUID CreatorID; 228 public LLUUID CreatorID;
229 public string Description;
230 public LLUUID FolderID;
232 public sbyte InvType; 231 public sbyte InvType;
233 public sbyte Type; 232 public LLUUID ItemID;
234 public string Name = String.Empty; 233 public string Name = String.Empty;
235 public string Description; 234 public LLUUID OwnerID;
235 public sbyte Type;
236 236
237 public InventoryItem() 237 public InventoryItem()
238 { 238 {
@@ -252,4 +252,4 @@ namespace OpenSim.Framework
252 return result; 252 return result;
253 } 253 }
254 } 254 }
255} 255} \ No newline at end of file