aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs66
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs18
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs6
3 files changed, 47 insertions, 43 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c4b025a..e643a0e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1877,7 +1877,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1877 bulkUpdate.AgentData.TransactionID = transactionId; 1877 bulkUpdate.AgentData.TransactionID = transactionId;
1878 bulkUpdate.FolderData = folderDataBlocks.ToArray(); 1878 bulkUpdate.FolderData = folderDataBlocks.ToArray();
1879 1879
1880 //Console.WriteLine("SendBulkUpdateInventory :" + bulkUpdate); 1880 //m_log.Debug("SendBulkUpdateInventory :" + bulkUpdate);
1881 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 1881 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
1882 } 1882 }
1883 } 1883 }
@@ -1920,7 +1920,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1920 items.RemoveAt(items.Count - 1); 1920 items.RemoveAt(items.Count - 1);
1921 } 1921 }
1922 1922
1923 //Console.WriteLine("SendBulkUpdateInventoryRecursive :" + bulkUpdate); 1923 //m_log.Debug("SendBulkUpdateInventoryRecursive :" + bulkUpdate);
1924 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 1924 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
1925 1925
1926 folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>(); 1926 folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>();
@@ -3101,7 +3101,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3101 3101
3102 packet.ParamList = returnblock; 3102 packet.ParamList = returnblock;
3103 packet.Header.Reliable = false; 3103 packet.Header.Reliable = false;
3104 //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString()); 3104 //m_log.Debug("[ESTATE]: SIM--->" + packet.ToString());
3105 OutPacket(packet, ThrottleOutPacketType.Task); 3105 OutPacket(packet, ThrottleOutPacketType.Task);
3106 } 3106 }
3107 3107
@@ -3895,7 +3895,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3895 /// <returns></returns> 3895 /// <returns></returns>
3896 protected bool AgentTextureCached(IClientAPI simclient, Packet packet) 3896 protected bool AgentTextureCached(IClientAPI simclient, Packet packet)
3897 { 3897 {
3898 //Console.WriteLine("texture cached: " + packet.ToString()); 3898 //m_log.Debug("texture cached: " + packet.ToString());
3899 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; 3899 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
3900 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); 3900 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
3901 // TODO: don't create new blocks if recycling an old packet 3901 // TODO: don't create new blocks if recycling an old packet
@@ -3924,7 +3924,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3924 protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet) 3924 protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet)
3925 { 3925 {
3926 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; 3926 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
3927 // Console.WriteLine("new multi update packet " + multipleupdate.ToString()); 3927 // m_log.Debug("new multi update packet " + multipleupdate.ToString());
3928 Scene tScene = (Scene)m_scene; 3928 Scene tScene = (Scene)m_scene;
3929 3929
3930 for (int i = 0; i < multipleupdate.ObjectData.Length; i++) 3930 for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
@@ -3956,7 +3956,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3956 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 3956 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
3957 if (handlerUpdatePrimSinglePosition != null) 3957 if (handlerUpdatePrimSinglePosition != null)
3958 { 3958 {
3959 // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 3959 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
3960 handlerUpdatePrimSinglePosition(localId, pos1, this); 3960 handlerUpdatePrimSinglePosition(localId, pos1, this);
3961 } 3961 }
3962 break; 3962 break;
@@ -3966,7 +3966,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3966 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 3966 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
3967 if (handlerUpdatePrimSingleRotation != null) 3967 if (handlerUpdatePrimSingleRotation != null)
3968 { 3968 {
3969 //Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 3969 //m_log.Debug("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
3970 handlerUpdatePrimSingleRotation(localId, rot1, this); 3970 handlerUpdatePrimSingleRotation(localId, rot1, this);
3971 } 3971 }
3972 break; 3972 break;
@@ -3976,7 +3976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3976 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 3976 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
3977 if (handlerUpdatePrimSingleRotation != null) 3977 if (handlerUpdatePrimSingleRotation != null)
3978 { 3978 {
3979 //Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 3979 //m_log.Debug("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
3980 handlerUpdatePrimSingleRotation(localId, rot2, this); 3980 handlerUpdatePrimSingleRotation(localId, rot2, this);
3981 } 3981 }
3982 break; 3982 break;
@@ -3988,7 +3988,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3988 handlerUpdatePrimScale = OnUpdatePrimScale; 3988 handlerUpdatePrimScale = OnUpdatePrimScale;
3989 if (handlerUpdatePrimScale != null) 3989 if (handlerUpdatePrimScale != null)
3990 { 3990 {
3991 // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 3991 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
3992 handlerUpdatePrimScale(localId, scale1, this); 3992 handlerUpdatePrimScale(localId, scale1, this);
3993 3993
3994 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 3994 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
@@ -4026,8 +4026,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4026 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; 4026 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
4027 if (handlerUpdatePrimGroupRotation != null) 4027 if (handlerUpdatePrimGroupRotation != null)
4028 { 4028 {
4029 //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 4029 //m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
4030 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 4030 // m_log.Debug("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
4031 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this); 4031 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
4032 } 4032 }
4033 break; 4033 break;
@@ -4038,12 +4038,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4038 handlerUpdatePrimScale = OnUpdatePrimScale; 4038 handlerUpdatePrimScale = OnUpdatePrimScale;
4039 if (handlerUpdatePrimScale != null) 4039 if (handlerUpdatePrimScale != null)
4040 { 4040 {
4041 //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 4041 //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
4042 handlerUpdatePrimScale(localId, scale2, this); 4042 handlerUpdatePrimScale(localId, scale2, this);
4043 4043
4044 // Change the position based on scale (for bug number 246) 4044 // Change the position based on scale (for bug number 246)
4045 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 4045 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
4046 // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 4046 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
4047 if (handlerUpdatePrimSinglePosition != null) 4047 if (handlerUpdatePrimSinglePosition != null)
4048 { 4048 {
4049 handlerUpdatePrimSinglePosition(localId, pos4, this); 4049 handlerUpdatePrimSinglePosition(localId, pos4, this);
@@ -4057,7 +4057,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4057 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 4057 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
4058 if (handlerUpdatePrimGroupScale != null) 4058 if (handlerUpdatePrimGroupScale != null)
4059 { 4059 {
4060 // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 4060 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
4061 handlerUpdatePrimGroupScale(localId, scale5, this); 4061 handlerUpdatePrimGroupScale(localId, scale5, this);
4062 handlerUpdateVector = OnUpdatePrimGroupPosition; 4062 handlerUpdateVector = OnUpdatePrimGroupPosition;
4063 4063
@@ -4074,7 +4074,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4074 handlerUpdatePrimScale = OnUpdatePrimScale; 4074 handlerUpdatePrimScale = OnUpdatePrimScale;
4075 if (handlerUpdatePrimScale != null) 4075 if (handlerUpdatePrimScale != null)
4076 { 4076 {
4077 // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 4077 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
4078 handlerUpdatePrimScale(localId, scale6, this); 4078 handlerUpdatePrimScale(localId, scale6, this);
4079 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 4079 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
4080 if (handlerUpdatePrimSinglePosition != null) 4080 if (handlerUpdatePrimSinglePosition != null)
@@ -4733,7 +4733,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4733 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack; 4733 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack;
4734 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData; 4734 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData;
4735 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data; 4735 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data;
4736 //Console.WriteLine("Agent Sends:" + Utils.BytesToString(querydata.Name)); 4736 //m_log.Debug("Agent Sends:" + Utils.BytesToString(querydata.Name));
4737 4737
4738 handlerAvatarPickerRequest = OnAvatarPickerRequest; 4738 handlerAvatarPickerRequest = OnAvatarPickerRequest;
4739 if (handlerAvatarPickerRequest != null) 4739 if (handlerAvatarPickerRequest != null)
@@ -5285,7 +5285,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5285 5285
5286 case PacketType.RequestImage: 5286 case PacketType.RequestImage:
5287 RequestImagePacket imageRequest = (RequestImagePacket)Pack; 5287 RequestImagePacket imageRequest = (RequestImagePacket)Pack;
5288 //Console.WriteLine("image request: " + Pack.ToString()); 5288 //m_log.Debug("image request: " + Pack.ToString());
5289 5289
5290 //handlerTextureRequest = null; 5290 //handlerTextureRequest = null;
5291 5291
@@ -5311,10 +5311,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5311 } 5311 }
5312 break; 5312 break;
5313 case PacketType.TransferRequest: 5313 case PacketType.TransferRequest:
5314 //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); 5314 //m_log.Debug("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
5315 5315
5316 TransferRequestPacket transfer = (TransferRequestPacket)Pack; 5316 TransferRequestPacket transfer = (TransferRequestPacket)Pack;
5317 //Console.WriteLine("Transfer Request: " + transfer.ToString()); 5317 //m_log.Debug("Transfer Request: " + transfer.ToString());
5318 // Validate inventory transfers 5318 // Validate inventory transfers
5319 // Has to be done here, because AssetCache can't do it 5319 // Has to be done here, because AssetCache can't do it
5320 // 5320 //
@@ -5409,8 +5409,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5409 break; 5409 break;
5410 case PacketType.AssetUploadRequest: 5410 case PacketType.AssetUploadRequest:
5411 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; 5411 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
5412 // Console.WriteLine("upload request " + request.ToString()); 5412 // m_log.Debug("upload request " + request.ToString());
5413 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString()); 5413 // m_log.Debug("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
5414 UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); 5414 UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
5415 5415
5416 handlerAssetUploadRequest = OnAssetUploadRequest; 5416 handlerAssetUploadRequest = OnAssetUploadRequest;
@@ -5606,7 +5606,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5606 } 5606 }
5607 } 5607 }
5608 } 5608 }
5609 //Console.WriteLine(Pack.ToString()); 5609 //m_log.Debug(Pack.ToString());
5610 /*for (int i = 0; i < update.InventoryData.Length; i++) 5610 /*for (int i = 0; i < update.InventoryData.Length; i++)
5611 { 5611 {
5612 if (update.InventoryData[i].TransactionID != UUID.Zero) 5612 if (update.InventoryData[i].TransactionID != UUID.Zero)
@@ -5614,7 +5614,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5614 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId)); 5614 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId));
5615 if (asset != null) 5615 if (asset != null)
5616 { 5616 {
5617 // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache"); 5617 // m_log.Debug("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache");
5618 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 5618 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
5619 } 5619 }
5620 else 5620 else
@@ -5622,12 +5622,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5622 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); 5622 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
5623 if (asset != null) 5623 if (asset != null)
5624 { 5624 {
5625 //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache"); 5625 //m_log.Debug("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache");
5626 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 5626 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
5627 } 5627 }
5628 else 5628 else
5629 { 5629 {
5630 //Console.WriteLine("trying to update inventory item, but asset is null"); 5630 //m_log.Debug("trying to update inventory item, but asset is null");
5631 } 5631 }
5632 } 5632 }
5633 } 5633 }
@@ -5778,7 +5778,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5778 break; 5778 break;
5779 5779
5780 case PacketType.RezScript: 5780 case PacketType.RezScript:
5781 //Console.WriteLine(Pack.ToString()); 5781 //m_log.Debug(Pack.ToString());
5782 RezScriptPacket rezScriptx = (RezScriptPacket)Pack; 5782 RezScriptPacket rezScriptx = (RezScriptPacket)Pack;
5783 5783
5784 handlerRezScript = OnRezScript; 5784 handlerRezScript = OnRezScript;
@@ -5894,7 +5894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5894 5894
5895 case PacketType.TeleportLocationRequest: 5895 case PacketType.TeleportLocationRequest:
5896 TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack; 5896 TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
5897 // Console.WriteLine(tpLocReq.ToString()); 5897 // m_log.Debug(tpLocReq.ToString());
5898 5898
5899 handlerTeleportLocationRequest = OnTeleportLocationRequest; 5899 handlerTeleportLocationRequest = OnTeleportLocationRequest;
5900 if (handlerTeleportLocationRequest != null) 5900 if (handlerTeleportLocationRequest != null)
@@ -6070,7 +6070,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6070 } 6070 }
6071 break; 6071 break;
6072 case PacketType.ParcelObjectOwnersRequest: 6072 case PacketType.ParcelObjectOwnersRequest:
6073 //Console.WriteLine(Pack.ToString()); 6073 //m_log.Debug(Pack.ToString());
6074 ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack; 6074 ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;
6075 6075
6076 handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest; 6076 handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest;
@@ -6135,7 +6135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6135 6135
6136 case PacketType.EstateOwnerMessage: 6136 case PacketType.EstateOwnerMessage:
6137 EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; 6137 EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
6138 //System.Console.WriteLine(messagePacket.ToString()); 6138 //m_log.Debug(messagePacket.ToString());
6139 switch (Utils.BytesToString(messagePacket.MethodData.Method)) 6139 switch (Utils.BytesToString(messagePacket.MethodData.Method))
6140 { 6140 {
6141 case "getinfo": 6141 case "getinfo":
@@ -6663,7 +6663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6663 6663
6664 case PacketType.MapItemRequest: 6664 case PacketType.MapItemRequest:
6665 MapItemRequestPacket mirpk = (MapItemRequestPacket)Pack; 6665 MapItemRequestPacket mirpk = (MapItemRequestPacket)Pack;
6666 //System.Console.WriteLine(mirpk.ToString()); 6666 //m_log.Debug(mirpk.ToString());
6667 handlerMapItemRequest = OnMapItemRequest; 6667 handlerMapItemRequest = OnMapItemRequest;
6668 if (handlerMapItemRequest != null) 6668 if (handlerMapItemRequest != null)
6669 { 6669 {
@@ -6711,7 +6711,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6711 break; 6711 break;
6712 case PacketType.DirPlacesQuery: 6712 case PacketType.DirPlacesQuery:
6713 DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack; 6713 DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack;
6714 //Console.WriteLine(dirPlacesQueryPacket.ToString()); 6714 //m_log.Debug(dirPlacesQueryPacket.ToString());
6715 6715
6716 handlerDirPlacesQuery = OnDirPlacesQuery; 6716 handlerDirPlacesQuery = OnDirPlacesQuery;
6717 if (handlerDirPlacesQuery != null) 6717 if (handlerDirPlacesQuery != null)
@@ -7674,7 +7674,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7674 7674
7675 public void SendAsset(AssetRequestToClient req) 7675 public void SendAsset(AssetRequestToClient req)
7676 { 7676 {
7677 //Console.WriteLine("sending asset " + req.RequestAssetID); 7677 //m_log.Debug("sending asset " + req.RequestAssetID);
7678 TransferInfoPacket Transfer = new TransferInfoPacket(); 7678 TransferInfoPacket Transfer = new TransferInfoPacket();
7679 Transfer.TransferInfo.ChannelType = 2; 7679 Transfer.TransferInfo.ChannelType = 2;
7680 Transfer.TransferInfo.Status = 0; 7680 Transfer.TransferInfo.Status = 0;
@@ -8161,7 +8161,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8161 mrdata.Name = Utils.StringToBytes(replies[i].name); 8161 mrdata.Name = Utils.StringToBytes(replies[i].name);
8162 mirplk.Data[i] = mrdata; 8162 mirplk.Data[i] = mrdata;
8163 } 8163 }
8164 //System.Console.WriteLine(mirplk.ToString()); 8164 //m_log.Debug(mirplk.ToString());
8165 OutPacket(mirplk, ThrottleOutPacketType.Task); 8165 OutPacket(mirplk, ThrottleOutPacketType.Task);
8166 8166
8167 } 8167 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 23ed798..0fb27d4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -32,6 +32,8 @@ using OpenMetaverse;
32using OpenMetaverse.Imaging; 32using OpenMetaverse.Imaging;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using log4net;
36using System.Reflection;
35 37
36namespace OpenSim.Region.ClientStack.LindenUDP 38namespace OpenSim.Region.ClientStack.LindenUDP
37{ 39{
@@ -41,6 +43,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
41 /// </summary> 43 /// </summary>
42 public class LLImageManager 44 public class LLImageManager
43 { 45 {
46
44 /// <summary> 47 /// <summary>
45 /// Priority Queue for images. Contains lots of data 48 /// Priority Queue for images. Contains lots of data
46 /// </summary> 49 /// </summary>
@@ -114,7 +117,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
114 if (m_shuttingdown) 117 if (m_shuttingdown)
115 return; 118 return;
116 119
117 //Console.WriteLine("AssetCallback for assetId" + assetID); 120 //m_log.Debug("AssetCallback for assetId" + assetID);
118 121
119 if (asset == null || asset.Data == null) 122 if (asset == null || asset.Data == null)
120 { 123 {
@@ -249,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
249 } 252 }
250 253
251 // uncomment the following line to see the upper most asset and the priority 254 // uncomment the following line to see the upper most asset and the priority
252 //Console.WriteLine(process.ToString()); 255 //m_log.Debug(process.ToString());
253 256
254 // Lower priority to give the next image a chance to bubble up 257 // Lower priority to give the next image a chance to bubble up
255 pq[h] -= 50000; 258 pq[h] -= 50000;
@@ -359,6 +362,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
359 /// </summary> 362 /// </summary>
360 public class J2KImage 363 public class J2KImage
361 { 364 {
365 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
362 private AssetBase m_asset_ref = null; 366 private AssetBase m_asset_ref = null;
363 public volatile int LastPacketNum = 0; 367 public volatile int LastPacketNum = 0;
364 public volatile int DiscardLimit = 0; 368 public volatile int DiscardLimit = 0;
@@ -550,7 +554,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
550 try { Buffer.BlockCopy(m_asset_ref.Data, 0, firstImageData, 0, FIRST_IMAGE_PACKET_SIZE); } 554 try { Buffer.BlockCopy(m_asset_ref.Data, 0, firstImageData, 0, FIRST_IMAGE_PACKET_SIZE); }
551 catch (Exception) 555 catch (Exception)
552 { 556 {
553 Console.WriteLine(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(), firstImageData.Length, FIRST_IMAGE_PACKET_SIZE)); 557 m_log.Error(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(), firstImageData.Length, FIRST_IMAGE_PACKET_SIZE));
554 558
555 //m_log.Error("Texture data copy failed on first packet for " + m_asset_ref.FullID.ToString()); 559 //m_log.Error("Texture data copy failed on first packet for " + m_asset_ref.FullID.ToString());
556 //m_cancel = true; 560 //m_cancel = true;
@@ -569,8 +573,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
569 //if (imagePacketSize > 0) 573 //if (imagePacketSize > 0)
570 // imagePacketSize = IMAGE_PACKET_SIZE; 574 // imagePacketSize = IMAGE_PACKET_SIZE;
571 //if (imagePacketSize != 1000) 575 //if (imagePacketSize != 1000)
572 // Console.WriteLine("ENdPacket"); 576 // m_log.Debug("ENdPacket");
573 //Console.WriteLine(String.Format("srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(),0, imagePacketSize)); 577 //m_log.Debug(String.Format("srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(),0, imagePacketSize));
574 578
575 bool atEnd = false; 579 bool atEnd = false;
576 580
@@ -591,9 +595,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
591 try { Buffer.BlockCopy(m_asset_ref.Data, CurrentBytePosition(), imageData, 0, imagePacketSize); } 595 try { Buffer.BlockCopy(m_asset_ref.Data, CurrentBytePosition(), imageData, 0, imagePacketSize); }
592 catch (Exception e) 596 catch (Exception e)
593 { 597 {
594 Console.WriteLine(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize:{3}, currpak:{4}, stoppak:{5}, totalpak:{6}", m_asset_ref.Data.Length, CurrentBytePosition(), 598 m_log.Error(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize:{3}, currpak:{4}, stoppak:{5}, totalpak:{6}", m_asset_ref.Data.Length, CurrentBytePosition(),
595 imageData.Length, imagePacketSize, CurrentPacket, StopPacket, TexturePacketCount())); 599 imageData.Length, imagePacketSize, CurrentPacket, StopPacket, TexturePacketCount()));
596 Console.WriteLine(e.ToString()); 600 m_log.Error(e.ToString());
597 //m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString()); 601 //m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString());
598 //m_cancel = true; 602 //m_cancel = true;
599 //m_sending = false; 603 //m_sending = false;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 53506d3..9c231b5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
57 protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender) 57 protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender)
58 { 58 {
59 numBytes = 0; 59 numBytes = 0;
60 60
61 //System.Console.WriteLine("Queue size " + m_chunksToLoad.Count); 61 //m_log.Debug("Queue size " + m_chunksToLoad.Count);
62 62
63 if (m_chunksToLoad.Count <= 0) 63 if (m_chunksToLoad.Count <= 0)
64 return false; 64 return false;
@@ -150,4 +150,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
150 Sender = sender; 150 Sender = sender;
151 } 151 }
152 } 152 }
153} \ No newline at end of file 153}