aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs4
-rw-r--r--OpenSim/Framework/Communications/RestClient/RestClient.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs17
-rw-r--r--OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs4
5 files changed, 20 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 4b5df5c..23cc884 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework.Communications.Cache
77 } 77 }
78 else 78 else
79 { 79 {
80 m_log.ErrorFormat("[ASSET SERVER]: Asset {0} not found by asset server", req.AssetID); 80 //m_log.ErrorFormat("[ASSET SERVER]: Asset {0} not found by asset server", req.AssetID);
81 81
82 m_receiver.AssetNotFound(req.AssetID); 82 m_receiver.AssetNotFound(req.AssetID);
83 } 83 }
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.Communications.Cache
138 m_assetRequests.Enqueue(req); 138 m_assetRequests.Enqueue(req);
139 139
140 #if DEBUG 140 #if DEBUG
141 m_log.InfoFormat("[ASSET SERVER]: Added {0} to request queue", assetID); 141 //m_log.InfoFormat("[ASSET SERVER]: Added {0} to request queue", assetID);
142 #endif 142 #endif
143 } 143 }
144 144
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index bf81565..f1b2fc7 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications
240 } 240 }
241 } 241 }
242 realuri = sb.ToString(); 242 realuri = sb.ToString();
243 m_log.InfoFormat("[REST]: RestURL: {0}", realuri); 243 //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri);
244 return new Uri(sb.ToString()); 244 return new Uri(sb.ToString());
245 } 245 }
246 246
@@ -443,4 +443,4 @@ namespace OpenSim.Framework.Communications
443 443
444 #endregion Async Invocation 444 #endregion Async Invocation
445 } 445 }
446} \ No newline at end of file 446}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 58d425d..c5ce43c 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2329,10 +2329,19 @@ namespace OpenSim.Region.ClientStack
2329 return true; 2329 return true;
2330 } 2330 }
2331 2331
2332 /// <summary>
2333 /// Send a response back to a client when it asks the asset server (via the region server) if it has
2334 /// its appearance texture cached.
2335 ///
2336 /// At the moment, we always reply that there is no cached texture.
2337 /// </summary>
2338 /// <param name="simclient"></param>
2339 /// <param name="packet"></param>
2340 /// <returns></returns>
2332 protected bool AgentTextureCached(IClientAPI simclient, Packet packet) 2341 protected bool AgentTextureCached(IClientAPI simclient, Packet packet)
2333 { 2342 {
2334 //System.Console.WriteLine("texture cached: " + packet.ToString()); 2343 //System.Console.WriteLine("texture cached: " + packet.ToString());
2335 AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; 2344 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
2336 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); 2345 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
2337 // TODO: don't create new blocks if recycling an old packet 2346 // TODO: don't create new blocks if recycling an old packet
2338 cachedresp.AgentData.AgentID = AgentId; 2347 cachedresp.AgentData.AgentID = AgentId;
@@ -2340,12 +2349,12 @@ namespace OpenSim.Region.ClientStack
2340 cachedresp.AgentData.SerialNum = m_cachedTextureSerial; 2349 cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
2341 m_cachedTextureSerial++; 2350 m_cachedTextureSerial++;
2342 cachedresp.WearableData = 2351 cachedresp.WearableData =
2343 new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length]; 2352 new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
2344 2353
2345 for (int i = 0; i < chechedtex.WearableData.Length; i++) 2354 for (int i = 0; i < cachedtex.WearableData.Length; i++)
2346 { 2355 {
2347 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); 2356 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
2348 cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex; 2357 cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
2349 cachedresp.WearableData[i].TextureID = LLUUID.Zero; 2358 cachedresp.WearableData[i].TextureID = LLUUID.Zero;
2350 cachedresp.WearableData[i].HostName = new byte[0]; 2359 cachedresp.WearableData[i].HostName = new byte[0];
2351 } 2360 }
diff --git a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs
index 65374e9..7b835a1 100644
--- a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Environment.Modules
85 85
86 // XXX Temporarily disabling as this appears to be causing client crashes on at least 86 // XXX Temporarily disabling as this appears to be causing client crashes on at least
87 // 1.19.0(5) of the Linden Second Life client. 87 // 1.19.0(5) of the Linden Second Life client.
88 // m_client.OutPacket(notFound, ThrottleOutPacketType.Unknown); 88 // m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);
89 89
90 return true; 90 return true;
91 } 91 }
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 77829f0..6467ea3 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -139,8 +139,8 @@ namespace OpenSim.Region.Environment.Modules
139 if (texture == null || texture.Data == null) 139 if (texture == null || texture.Data == null)
140 { 140 {
141 m_log.DebugFormat( 141 m_log.DebugFormat(
142 "[USER TEXTURE DOWNLOAD SERVICE]: Queueing TextureNotFoundSender for {0}", 142 "[USER TEXTURE DOWNLOAD SERVICE]: Queueing TextureNotFoundSender for {0}, client {1}",
143 textureID); 143 textureID, m_client.AgentId);
144 144
145 ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID); 145 ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID);
146 EnqueueTextureSender(textureNotFoundSender); 146 EnqueueTextureSender(textureNotFoundSender);