From 8c80d98252f376a815e522c705a3c576dfc16f75 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 4 Feb 2007 11:36:35 +0000
Subject: Clean up

---
 InventoryManager.cs | 172 ++++++++++++++++++++++++++--------------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

(limited to 'InventoryManager.cs')

diff --git a/InventoryManager.cs b/InventoryManager.cs
index 72c9607..17f7f5c 100644
--- a/InventoryManager.cs
+++ b/InventoryManager.cs
@@ -38,20 +38,20 @@ namespace OpenSim
 	/// </summary>
 	public class InventoryManager
 	{
-		private System.Text.Encoding enc = System.Text.Encoding.ASCII;
+		
 		public Dictionary<LLUUID, InventoryFolder> Folders;
 		public Dictionary<LLUUID, InventoryItem> Items;
-		private Server server;
-		
+		private Server _server;
+		private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
 		private const uint FULL_MASK_PERMISSIONS = 2147483647;
 		 
 		/// <summary>
 		/// 
 		/// </summary>
 		/// <param name="serve"></param>
-		public InventoryManager(Server serve)
+		public InventoryManager(Server server)
 		{
-			server=serve;
+			_server = server;
 			Folders=new Dictionary<LLUUID, InventoryFolder>();
 			Items=new Dictionary<LLUUID, InventoryItem>();
 		}
@@ -63,23 +63,23 @@ namespace OpenSim
 		/// <param name="FolderID"></param>
 		/// <param name="Asset"></param>
 		/// <returns></returns>
-		public LLUUID AddToInventory(User_Agent_info UserInfo, LLUUID FolderID,AssetBase Asset)
+		public LLUUID AddToInventory(UserAgentInfo userInfo, LLUUID folderID, AssetBase asset)
 		{
-			if(this.Folders.ContainsKey(FolderID))
+			if(this.Folders.ContainsKey(folderID))
 			{
-				LLUUID NewItemID=LLUUID.Random();
+				LLUUID NewItemID = LLUUID.Random();
 				
-				InventoryItem Item=new InventoryItem();
-				Item.FolderID=FolderID;
-				Item.OwnerID=UserInfo.AgentID;
-				Item.AssetID=Asset.Full_ID;
-				Item.ItemID=NewItemID;
-				Item.Type=Asset.Type;
-				Item.Name=Asset.Name;
-				Item.Description=Asset.Description;
-				Item.InvType=Asset.InvType;
-				this.Items.Add(Item.ItemID,Item);
-				InventoryFolder Folder=Folders[Item.FolderID];
+				InventoryItem Item = new InventoryItem();
+				Item.FolderID = folderID;
+				Item.OwnerID = userInfo.AgentID;
+				Item.AssetID = asset.FullID;
+				Item.ItemID = NewItemID;
+				Item.Type = asset.Type;
+				Item.Name = asset.Name;
+				Item.Description = asset.Description;
+				Item.InvType = asset.InvType;
+				this.Items.Add(Item.ItemID, Item);
+				InventoryFolder Folder = Folders[Item.FolderID];
 				Folder.Items.Add(Item);
 				return(Item.ItemID);
 			}
@@ -95,12 +95,12 @@ namespace OpenSim
 		/// <param name="UserInfo"></param>
 		/// <param name="NewFolder"></param>
 		/// <returns></returns>
-		public bool CreateNewFolder(User_Agent_info UserInfo, LLUUID NewFolder)
+		public bool CreateNewFolder(UserAgentInfo userInfo, LLUUID newFolder)
 		{
-			InventoryFolder Folder=new InventoryFolder();
-			Folder.FolderID=NewFolder;
-			Folder.OwnerID=UserInfo.AgentID;
-			this.Folders.Add(Folder.FolderID,Folder);
+			InventoryFolder Folder = new InventoryFolder();
+			Folder.FolderID = newFolder;
+			Folder.OwnerID = userInfo.AgentID;
+			this.Folders.Add(Folder.FolderID, Folder);
 			
 			return(true);
 		}
@@ -110,49 +110,49 @@ namespace OpenSim
 		/// </summary>
 		/// <param name="User_info"></param>
 		/// <param name="FetchDescend"></param>
-		public void FetchInventoryDescendents(User_Agent_info User_info,FetchInventoryDescendentsPacket FetchDescend)
+		public void FetchInventoryDescendents(UserAgentInfo userInfo, FetchInventoryDescendentsPacket FetchDescend)
 		{
 			if(FetchDescend.InventoryData.FetchItems)
 			{
 				if(this.Folders.ContainsKey(FetchDescend.InventoryData.FolderID))
 				{
 						
-					InventoryFolder Folder=this.Folders[FetchDescend.InventoryData.FolderID];
-					InventoryDescendentsPacket Descend=new InventoryDescendentsPacket();
-					Descend.AgentData.AgentID=User_info.AgentID;
-					Descend.AgentData.OwnerID=Folder.OwnerID;
-					Descend.AgentData.FolderID=FetchDescend.InventoryData.FolderID;
-					Descend.AgentData.Descendents=Folder.Items.Count;
-					Descend.AgentData.Version=Folder.Items.Count;
+					InventoryFolder Folder = this.Folders[FetchDescend.InventoryData.FolderID];
+					InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();
+					Descend.AgentData.AgentID = userInfo.AgentID;
+					Descend.AgentData.OwnerID = Folder.OwnerID;
+					Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;
+					Descend.AgentData.Descendents = Folder.Items.Count;
+					Descend.AgentData.Version = Folder.Items.Count;
 					
-					Descend.ItemData=new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
-					for(int i=0; i<Folder.Items.Count ; i++)
+					Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
+					for(int i = 0; i < Folder.Items.Count ; i++)
 					{
 						
 						InventoryItem Item=Folder.Items[i];
-						Descend.ItemData[i]=new InventoryDescendentsPacket.ItemDataBlock();
-						Descend.ItemData[i].ItemID=Item.ItemID;
-						Descend.ItemData[i].AssetID=Item.AssetID;
-						Descend.ItemData[i].CreatorID=Item.CreatorID;
-						Descend.ItemData[i].BaseMask=FULL_MASK_PERMISSIONS;
-						Descend.ItemData[i].CreationDate=1000;
-						Descend.ItemData[i].Description=enc.GetBytes(Item.Description+"\0");
-						Descend.ItemData[i].EveryoneMask=FULL_MASK_PERMISSIONS;
-						Descend.ItemData[i].Flags=1;
-						Descend.ItemData[i].FolderID=Item.FolderID;
-						Descend.ItemData[i].GroupID=new LLUUID("00000000-0000-0000-0000-000000000000");
-						Descend.ItemData[i].GroupMask=FULL_MASK_PERMISSIONS;
-						Descend.ItemData[i].InvType=Item.InvType;
-						Descend.ItemData[i].Name=enc.GetBytes(Item.Name+"\0");
-						Descend.ItemData[i].NextOwnerMask=FULL_MASK_PERMISSIONS;
-						Descend.ItemData[i].OwnerID=Item.OwnerID;
-						Descend.ItemData[i].OwnerMask=FULL_MASK_PERMISSIONS;
-						Descend.ItemData[i].SalePrice=100;
-						Descend.ItemData[i].SaleType=0;
-						Descend.ItemData[i].Type=Item.Type;
-						Descend.ItemData[i].CRC=libsecondlife.Helpers.InventoryCRC(1000,0,Descend.ItemData[i].InvType,Descend.ItemData[i].Type,Descend.ItemData[i].AssetID ,Descend.ItemData[i].GroupID,100,Descend.ItemData[i].OwnerID,Descend.ItemData[i].CreatorID,Descend.ItemData[i].ItemID,Descend.ItemData[i].FolderID,FULL_MASK_PERMISSIONS,1,FULL_MASK_PERMISSIONS,FULL_MASK_PERMISSIONS,FULL_MASK_PERMISSIONS);
+						Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
+						Descend.ItemData[i].ItemID = Item.ItemID;
+						Descend.ItemData[i].AssetID = Item.AssetID;
+						Descend.ItemData[i].CreatorID = Item.CreatorID;
+						Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
+						Descend.ItemData[i].CreationDate = 1000;
+						Descend.ItemData[i].Description = _enc.GetBytes(Item.Description+"\0");
+						Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
+						Descend.ItemData[i].Flags = 1;
+						Descend.ItemData[i].FolderID = Item.FolderID;
+						Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+						Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
+						Descend.ItemData[i].InvType = Item.InvType;
+						Descend.ItemData[i].Name = _enc.GetBytes(Item.Name+"\0");
+						Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
+						Descend.ItemData[i].OwnerID = Item.OwnerID;
+						Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
+						Descend.ItemData[i].SalePrice = 100;
+						Descend.ItemData[i].SaleType = 0;
+						Descend.ItemData[i].Type = Item.Type;
+						Descend.ItemData[i].CRC=libsecondlife.Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
 					}
-					server.SendPacket(Descend,true,User_info);
+					_server.SendPacket(Descend, true, userInfo);
 					
 				}
 			}
@@ -166,40 +166,40 @@ namespace OpenSim
 		/// 
 		/// </summary>
 		/// <param name="User_info"></param>
-		public void FetchInventory(User_Agent_info User_info, FetchInventoryPacket FetchItems)
+		public void FetchInventory(UserAgentInfo userInfo, FetchInventoryPacket FetchItems)
 		{
 			
-			for(int i=0; i<FetchItems.InventoryData.Length; i++)
+			for(int i = 0; i < FetchItems.InventoryData.Length; i++)
 			{
 				if(this.Items.ContainsKey(FetchItems.InventoryData[i].ItemID))
 				{
 					
-					InventoryItem Item=Items[FetchItems.InventoryData[i].ItemID];
-					FetchInventoryReplyPacket InventoryReply=new FetchInventoryReplyPacket();
-					InventoryReply.AgentData.AgentID=User_info.AgentID;
-					InventoryReply.InventoryData=new FetchInventoryReplyPacket.InventoryDataBlock[1];
-					InventoryReply.InventoryData[0]=new FetchInventoryReplyPacket.InventoryDataBlock();
-					InventoryReply.InventoryData[0].ItemID=Item.ItemID;
-					InventoryReply.InventoryData[0].AssetID=Item.AssetID;
-					InventoryReply.InventoryData[0].CreatorID=Item.CreatorID;
-					InventoryReply.InventoryData[0].BaseMask=FULL_MASK_PERMISSIONS;
-					InventoryReply.InventoryData[0].CreationDate=1000;
-					InventoryReply.InventoryData[0].Description=enc.GetBytes(  Item.Description+"\0");
-					InventoryReply.InventoryData[0].EveryoneMask=FULL_MASK_PERMISSIONS;
-					InventoryReply.InventoryData[0].Flags=1;
-					InventoryReply.InventoryData[0].FolderID=Item.FolderID;
-					InventoryReply.InventoryData[0].GroupID=new LLUUID("00000000-0000-0000-0000-000000000000");
-					InventoryReply.InventoryData[0].GroupMask=FULL_MASK_PERMISSIONS;
-					InventoryReply.InventoryData[0].InvType=Item.InvType;
-					InventoryReply.InventoryData[0].Name=enc.GetBytes(Item.Name+"\0");
-					InventoryReply.InventoryData[0].NextOwnerMask=FULL_MASK_PERMISSIONS;
-					InventoryReply.InventoryData[0].OwnerID=Item.OwnerID;
-					InventoryReply.InventoryData[0].OwnerMask=FULL_MASK_PERMISSIONS;
-					InventoryReply.InventoryData[0].SalePrice=100;
-					InventoryReply.InventoryData[0].SaleType=0;
-					InventoryReply.InventoryData[0].Type=Item.Type;
-					InventoryReply.InventoryData[0].CRC=libsecondlife.Helpers.InventoryCRC(1000,0,InventoryReply.InventoryData[0].InvType,InventoryReply.InventoryData[0].Type,InventoryReply.InventoryData[0].AssetID ,InventoryReply.InventoryData[0].GroupID,100,InventoryReply.InventoryData[0].OwnerID,InventoryReply.InventoryData[0].CreatorID,InventoryReply.InventoryData[0].ItemID,InventoryReply.InventoryData[0].FolderID,FULL_MASK_PERMISSIONS,1,FULL_MASK_PERMISSIONS,FULL_MASK_PERMISSIONS,FULL_MASK_PERMISSIONS);
-					server.SendPacket(InventoryReply,true,User_info);
+					InventoryItem Item = Items[FetchItems.InventoryData[i].ItemID];
+					FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();
+					InventoryReply.AgentData.AgentID = userInfo.AgentID;
+					InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
+					InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
+					InventoryReply.InventoryData[0].ItemID = Item.ItemID;
+					InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+					InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
+					InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+					InventoryReply.InventoryData[0].CreationDate = 1000;
+					InventoryReply.InventoryData[0].Description = _enc.GetBytes(  Item.Description+"\0");
+					InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+					InventoryReply.InventoryData[0].Flags = 1;
+					InventoryReply.InventoryData[0].FolderID = Item.FolderID;
+					InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+					InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+					InventoryReply.InventoryData[0].InvType = Item.InvType;
+					InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name+"\0");
+					InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+					InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
+					InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+					InventoryReply.InventoryData[0].SalePrice = 100;
+					InventoryReply.InventoryData[0].SaleType = 0;
+					InventoryReply.InventoryData[0].Type = Item.Type;
+					InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+					_server.SendPacket(InventoryReply, true, userInfo);
 				}
 			}
 		}
@@ -217,7 +217,7 @@ namespace OpenSim
 		
 		public InventoryFolder()
 		{
-			Items=new List<InventoryItem>();
+			Items = new List<InventoryItem>();
 		}
 		
 	}
@@ -228,7 +228,7 @@ namespace OpenSim
 		public LLUUID OwnerID;
 		public LLUUID ItemID;
 		public LLUUID AssetID;
-		public LLUUID CreatorID=LLUUID.Zero;
+		public LLUUID CreatorID = LLUUID.Zero;
 		public sbyte InvType;
 		public sbyte Type;
 		public string Name;
-- 
cgit v1.1