OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A little bit of cleaning up.

afrisby
MW 2007-08-22 16:59:13 +00:00
parent 5403153c15
commit 5ea6d8d739
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -327,7 +327,7 @@ namespace OpenSim.Framework.Communications.Caches
//inventory asset request //inventory asset request
requestID = new LLUUID(transferRequest.TransferInfo.Params, 80); requestID = new LLUUID(transferRequest.TransferInfo.Params, 80);
source = 3; source = 3;
Console.WriteLine("asset request " + requestID); //Console.WriteLine("asset request " + requestID);
} }
//check to see if asset is in local cache, if not we need to request it from asset server. //check to see if asset is in local cache, if not we need to request it from asset server.
//Console.WriteLine("asset request " + requestID); //Console.WriteLine("asset request " + requestID);

4
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -634,8 +634,8 @@ namespace OpenSim.Region.Environment.Scenes
taskItem.desc = item.inventoryDescription; taskItem.desc = item.inventoryDescription;
taskItem.owner_id = item.avatarID; taskItem.owner_id = item.avatarID;
taskItem.creator_id = item.creatorsID; taskItem.creator_id = item.creatorsID;
taskItem.type = taskItem.AssetTypes[item.assetType]; taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType];
taskItem.inv_type = taskItem.AssetTypes[item.invType]; taskItem.inv_type = SceneObjectPart.TaskInventoryItem.Types[item.invType];
part.AddInventoryItem(taskItem); part.AddInventoryItem(taskItem);
return true; return true;
} }

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -717,7 +717,7 @@ namespace OpenSim.Region.Environment.Scenes
public class TaskInventoryItem public class TaskInventoryItem
{ {
public string[] AssetTypes = new string[] public static string[] Types = new string[]
{ {
"texture", "texture",
"sound", "sound",
@ -734,7 +734,7 @@ namespace OpenSim.Region.Environment.Scenes
}; };
public LLUUID item_id = LLUUID.Zero; 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 base_mask = FULL_MASK_PERMISSIONS;
public uint owner_mask = FULL_MASK_PERMISSIONS; public uint owner_mask = FULL_MASK_PERMISSIONS;

2
OpenSim/Region/Environment/XferManager.cs
View File

@ -26,7 +26,6 @@ namespace OpenSim.Region.Environment
/// <param name="fileName"></param> /// <param name="fileName"></param>
public void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName) public void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName)
{ {
Console.WriteLine("xfer request for " + fileName);
lock (NewFiles) lock (NewFiles)
{ {
if (NewFiles.ContainsKey(fileName)) if (NewFiles.ContainsKey(fileName))
@ -100,7 +99,6 @@ namespace OpenSim.Region.Environment
Array.Copy(Data, 0, transferData, 4, Data.Length); Array.Copy(Data, 0, transferData, 4, Data.Length);
Client.SendXferPacket(XferID, 0 + 0x80000000, transferData); Client.SendXferPacket(XferID, 0 + 0x80000000, transferData);
complete = true; complete = true;
Console.WriteLine("xfer is under 1000 bytes");
} }
else else
{ {