From 42bd38960c6743bb3c1d57d951d9f68578575c27 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 13 Feb 2009 17:02:26 +0000
Subject: * Apply http://opensimulator.org/mantis/view.php?id=3149 * If the
texture does not contain any discard levels the last image packet was not
sent * Thanks Snowdrop
---
OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 75b5644..6efe3e1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
pq[PQHandles[req.RequestedAssetID]].data.Update(req.DiscardLevel, (int)req.PacketNumber);
}
-
///
/// Callback for the asset system
///
@@ -128,14 +127,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
//else
-
pq[PQHandles[assetID]].data.asset = asset;
//lock (pq[PQHandles[assetID]].data)
pq[PQHandles[assetID]].data.Update((int)pq[PQHandles[assetID]].data.Priority, pq[PQHandles[assetID]].data.CurrentPacket);
-
-
-
}
///
@@ -147,11 +142,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_shuttingdown)
return;
-
IPriorityQueueHandle> h = null;
for (int j = 0; j < count; j++)
{
-
lock (pq)
{
if (!pq.IsEmpty)
@@ -221,9 +214,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// no module, no layers, full resolution only
j2kDecodedCallback(process.data.AssetId, new OpenJPEG.J2KLayerInfo[0]);
}
-
-
-
} // Are we waiting?
else if (!process.data.J2KDecodeWaiting)
{
@@ -357,12 +347,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
-
lock (PQHandles)
PQHandles.Clear();
m_client = null;
}
-
}
///
@@ -525,7 +513,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
// No layers, send full image
DiscardLevel = 0;
- StopPacket = TexturePacketCount() - 1;
+ StopPacket = TexturePacketCount();
CurrentPacket = Util.Clamp(packet, 1, TexturePacketCount() - 1);
}
}
@@ -604,7 +592,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (Exception e)
{
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(),
- imageData.Length, imagePacketSize, CurrentPacket,StopPacket,TexturePacketCount()));
+ imageData.Length, imagePacketSize, CurrentPacket, StopPacket, TexturePacketCount()));
Console.WriteLine(e.ToString());
//m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString());
//m_cancel = true;
--
cgit v1.1