From 42123770de293d17993d85c3f3074f6106d9eaba Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 12 Mar 2008 17:02:08 +0000 Subject: [PATCH] * Add comments and slight corrections to ClientView.AgentTextureCached * Reduce 'asset not found' console debug spam --- .../Communications/Cache/AssetServerBase.cs | 4 ++-- .../Communications/RestClient/RestClient.cs | 4 ++-- OpenSim/Region/ClientStack/ClientView.cs | 17 +++++++++++++---- .../Modules/TextureNotFoundSender.cs | 2 +- .../Modules/UserTextureDownloadService.cs | 4 ++-- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 4b5df5c066..23cc884cc5 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -77,7 +77,7 @@ namespace OpenSim.Framework.Communications.Cache } else { - m_log.ErrorFormat("[ASSET SERVER]: Asset {0} not found by asset server", req.AssetID); + //m_log.ErrorFormat("[ASSET SERVER]: Asset {0} not found by asset server", req.AssetID); m_receiver.AssetNotFound(req.AssetID); } @@ -138,7 +138,7 @@ namespace OpenSim.Framework.Communications.Cache m_assetRequests.Enqueue(req); #if DEBUG - m_log.InfoFormat("[ASSET SERVER]: Added {0} to request queue", assetID); + //m_log.InfoFormat("[ASSET SERVER]: Added {0} to request queue", assetID); #endif } diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs index bf815652e6..f1b2fc7875 100644 --- a/OpenSim/Framework/Communications/RestClient/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs @@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications } } realuri = sb.ToString(); - m_log.InfoFormat("[REST]: RestURL: {0}", realuri); + //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri); return new Uri(sb.ToString()); } @@ -443,4 +443,4 @@ namespace OpenSim.Framework.Communications #endregion Async Invocation } -} \ No newline at end of file +} diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 58d425dbec..c5ce43c110 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -2329,10 +2329,19 @@ namespace OpenSim.Region.ClientStack return true; } + /// + /// Send a response back to a client when it asks the asset server (via the region server) if it has + /// its appearance texture cached. + /// + /// At the moment, we always reply that there is no cached texture. + /// + /// + /// + /// protected bool AgentTextureCached(IClientAPI simclient, Packet packet) { //System.Console.WriteLine("texture cached: " + packet.ToString()); - AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; + AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); // TODO: don't create new blocks if recycling an old packet cachedresp.AgentData.AgentID = AgentId; @@ -2340,12 +2349,12 @@ namespace OpenSim.Region.ClientStack cachedresp.AgentData.SerialNum = m_cachedTextureSerial; m_cachedTextureSerial++; cachedresp.WearableData = - new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length]; + new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length]; - for (int i = 0; i < chechedtex.WearableData.Length; i++) + for (int i = 0; i < cachedtex.WearableData.Length; i++) { cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); - cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex; + cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex; cachedresp.WearableData[i].TextureID = LLUUID.Zero; cachedresp.WearableData[i].HostName = new byte[0]; } diff --git a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs index 65374e9562..7b835a14b9 100644 --- a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs @@ -85,7 +85,7 @@ namespace OpenSim.Region.Environment.Modules // XXX Temporarily disabling as this appears to be causing client crashes on at least // 1.19.0(5) of the Linden Second Life client. - // m_client.OutPacket(notFound, ThrottleOutPacketType.Unknown); + // m_client.OutPacket(notFound, ThrottleOutPacketType.Texture); return true; } diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs index 77829f0849..6467ea3744 100644 --- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs @@ -139,8 +139,8 @@ namespace OpenSim.Region.Environment.Modules if (texture == null || texture.Data == null) { m_log.DebugFormat( - "[USER TEXTURE DOWNLOAD SERVICE]: Queueing TextureNotFoundSender for {0}", - textureID); + "[USER TEXTURE DOWNLOAD SERVICE]: Queueing TextureNotFoundSender for {0}, client {1}", + textureID, m_client.AgentId); ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID); EnqueueTextureSender(textureNotFoundSender);