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

* Add comments and slight corrections to ClientView.AgentTextureCached 

* Reduce 'asset not found' console debug spam
0.6.0-stable
Justin Clarke Casey 2008-03-12 17:02:08 +00:00
parent fc551ef127
commit 42123770de
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Framework.Communications.Cache
} }
else 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); m_receiver.AssetNotFound(req.AssetID);
} }
@ -138,7 +138,7 @@ namespace OpenSim.Framework.Communications.Cache
m_assetRequests.Enqueue(req); m_assetRequests.Enqueue(req);
#if DEBUG #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 #endif
} }

4
OpenSim/Framework/Communications/RestClient/RestClient.cs
View File

@ -240,7 +240,7 @@ namespace OpenSim.Framework.Communications
} }
} }
realuri = sb.ToString(); realuri = sb.ToString();
m_log.InfoFormat("[REST]: RestURL: {0}", realuri); //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri);
return new Uri(sb.ToString()); return new Uri(sb.ToString());
} }
@ -443,4 +443,4 @@ namespace OpenSim.Framework.Communications
#endregion Async Invocation #endregion Async Invocation
} }
} }

17
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -2329,10 +2329,19 @@ namespace OpenSim.Region.ClientStack
return true; return true;
} }
/// <summary>
/// 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.
/// </summary>
/// <param name="simclient"></param>
/// <param name="packet"></param>
/// <returns></returns>
protected bool AgentTextureCached(IClientAPI simclient, Packet packet) protected bool AgentTextureCached(IClientAPI simclient, Packet packet)
{ {
//System.Console.WriteLine("texture cached: " + packet.ToString()); //System.Console.WriteLine("texture cached: " + packet.ToString());
AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet
cachedresp.AgentData.AgentID = AgentId; cachedresp.AgentData.AgentID = AgentId;
@ -2340,12 +2349,12 @@ namespace OpenSim.Region.ClientStack
cachedresp.AgentData.SerialNum = m_cachedTextureSerial; cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
m_cachedTextureSerial++; m_cachedTextureSerial++;
cachedresp.WearableData = 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] = 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].TextureID = LLUUID.Zero;
cachedresp.WearableData[i].HostName = new byte[0]; cachedresp.WearableData[i].HostName = new byte[0];
} }

2
OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs
View File

@ -85,7 +85,7 @@ namespace OpenSim.Region.Environment.Modules
// XXX Temporarily disabling as this appears to be causing client crashes on at least // XXX Temporarily disabling as this appears to be causing client crashes on at least
// 1.19.0(5) of the Linden Second Life client. // 1.19.0(5) of the Linden Second Life client.
// m_client.OutPacket(notFound, ThrottleOutPacketType.Unknown); // m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);
return true; return true;
} }

4
OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
View File

@ -139,8 +139,8 @@ namespace OpenSim.Region.Environment.Modules
if (texture == null || texture.Data == null) if (texture == null || texture.Data == null)
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[USER TEXTURE DOWNLOAD SERVICE]: Queueing TextureNotFoundSender for {0}", "[USER TEXTURE DOWNLOAD SERVICE]: Queueing TextureNotFoundSender for {0}, client {1}",
textureID); textureID, m_client.AgentId);
ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID); ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID);
EnqueueTextureSender(textureNotFoundSender); EnqueueTextureSender(textureNotFoundSender);