aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-08-22 16:59:13 +0000
committerMW2007-08-22 16:59:13 +0000
commit5ea6d8d739d9aaf0cbcbe3151a37d50335ac1b8b (patch)
treed1b1a451161731003c4f66fa1f0a85a3772a1298 /OpenSim
parentA case of 'while I was working someone set me up the bomb'. (diff)
downloadopensim-SC-5ea6d8d739d9aaf0cbcbe3151a37d50335ac1b8b.zip
opensim-SC-5ea6d8d739d9aaf0cbcbe3151a37d50335ac1b8b.tar.gz
opensim-SC-5ea6d8d739d9aaf0cbcbe3151a37d50335ac1b8b.tar.bz2
opensim-SC-5ea6d8d739d9aaf0cbcbe3151a37d50335ac1b8b.tar.xz
A little bit of cleaning up.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/Environment/XferManager.cs2
4 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index c08bef2..d0186e6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -327,7 +327,7 @@ namespace OpenSim.Framework.Communications.Caches
327 //inventory asset request 327 //inventory asset request
328 requestID = new LLUUID(transferRequest.TransferInfo.Params, 80); 328 requestID = new LLUUID(transferRequest.TransferInfo.Params, 80);
329 source = 3; 329 source = 3;
330 Console.WriteLine("asset request " + requestID); 330 //Console.WriteLine("asset request " + requestID);
331 } 331 }
332 //check to see if asset is in local cache, if not we need to request it from asset server. 332 //check to see if asset is in local cache, if not we need to request it from asset server.
333 //Console.WriteLine("asset request " + requestID); 333 //Console.WriteLine("asset request " + requestID);
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
634 taskItem.desc = item.inventoryDescription; 634 taskItem.desc = item.inventoryDescription;
635 taskItem.owner_id = item.avatarID; 635 taskItem.owner_id = item.avatarID;
636 taskItem.creator_id = item.creatorsID; 636 taskItem.creator_id = item.creatorsID;
637 taskItem.type = taskItem.AssetTypes[item.assetType]; 637 taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType];
638 taskItem.inv_type = taskItem.AssetTypes[item.invType]; 638 taskItem.inv_type = SceneObjectPart.TaskInventoryItem.Types[item.invType];
639 part.AddInventoryItem(taskItem); 639 part.AddInventoryItem(taskItem);
640 return true; 640 return true;
641 } 641 }
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
717 717
718 public class TaskInventoryItem 718 public class TaskInventoryItem
719 { 719 {
720 public string[] AssetTypes = new string[] 720 public static string[] Types = new string[]
721 { 721 {
722 "texture", 722 "texture",
723 "sound", 723 "sound",
@@ -734,7 +734,7 @@ namespace OpenSim.Region.Environment.Scenes
734 }; 734 };
735 735
736 public LLUUID item_id = LLUUID.Zero; 736 public LLUUID item_id = LLUUID.Zero;
737 public LLUUID parent_id = LLUUID.Zero; 737 public LLUUID parent_id = LLUUID.Zero; //parent folder id
738 738
739 public uint base_mask = FULL_MASK_PERMISSIONS; 739 public uint base_mask = FULL_MASK_PERMISSIONS;
740 public uint owner_mask = FULL_MASK_PERMISSIONS; 740 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
26 /// <param name="fileName"></param> 26 /// <param name="fileName"></param>
27 public void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName) 27 public void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName)
28 { 28 {
29 Console.WriteLine("xfer request for " + fileName);
30 lock (NewFiles) 29 lock (NewFiles)
31 { 30 {
32 if (NewFiles.ContainsKey(fileName)) 31 if (NewFiles.ContainsKey(fileName))
@@ -100,7 +99,6 @@ namespace OpenSim.Region.Environment
100 Array.Copy(Data, 0, transferData, 4, Data.Length); 99 Array.Copy(Data, 0, transferData, 4, Data.Length);
101 Client.SendXferPacket(XferID, 0 + 0x80000000, transferData); 100 Client.SendXferPacket(XferID, 0 + 0x80000000, transferData);
102 complete = true; 101 complete = true;
103 Console.WriteLine("xfer is under 1000 bytes");
104 } 102 }
105 else 103 else
106 { 104 {