From 5ea6d8d739d9aaf0cbcbe3151a37d50335ac1b8b Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 22 Aug 2007 16:59:13 +0000 Subject: A little bit of cleaning up. --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 ++-- OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 4 ++-- OpenSim/Region/Environment/XferManager.cs | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index a9f283f..99bdda9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -634,8 +634,8 @@ namespace OpenSim.Region.Environment.Scenes taskItem.desc = item.inventoryDescription; taskItem.owner_id = item.avatarID; taskItem.creator_id = item.creatorsID; - taskItem.type = taskItem.AssetTypes[item.assetType]; - taskItem.inv_type = taskItem.AssetTypes[item.invType]; + taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType]; + taskItem.inv_type = SceneObjectPart.TaskInventoryItem.Types[item.invType]; part.AddInventoryItem(taskItem); return true; } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index cbe7b09..7684b4f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -717,7 +717,7 @@ namespace OpenSim.Region.Environment.Scenes public class TaskInventoryItem { - public string[] AssetTypes = new string[] + public static string[] Types = new string[] { "texture", "sound", @@ -734,7 +734,7 @@ namespace OpenSim.Region.Environment.Scenes }; public LLUUID item_id = LLUUID.Zero; - public LLUUID parent_id = LLUUID.Zero; + public LLUUID parent_id = LLUUID.Zero; //parent folder id public uint base_mask = FULL_MASK_PERMISSIONS; public uint owner_mask = FULL_MASK_PERMISSIONS; diff --git a/OpenSim/Region/Environment/XferManager.cs b/OpenSim/Region/Environment/XferManager.cs index 7a8e762..c49601c 100644 --- a/OpenSim/Region/Environment/XferManager.cs +++ b/OpenSim/Region/Environment/XferManager.cs @@ -26,7 +26,6 @@ namespace OpenSim.Region.Environment /// public void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName) { - Console.WriteLine("xfer request for " + fileName); lock (NewFiles) { if (NewFiles.ContainsKey(fileName)) @@ -100,7 +99,6 @@ namespace OpenSim.Region.Environment Array.Copy(Data, 0, transferData, 4, Data.Length); Client.SendXferPacket(XferID, 0 + 0x80000000, transferData); complete = true; - Console.WriteLine("xfer is under 1000 bytes"); } else { -- cgit v1.1