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

* 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
0.6.3-post-fixes
Justin Clarke Casey 2009-02-13 17:02:26 +00:00
parent 88b273bc71
commit 42bd38960c
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
View File

@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
pq[PQHandles[req.RequestedAssetID]].data.Update(req.DiscardLevel, (int)req.PacketNumber); pq[PQHandles[req.RequestedAssetID]].data.Update(req.DiscardLevel, (int)req.PacketNumber);
} }
/// <summary> /// <summary>
/// Callback for the asset system /// Callback for the asset system
/// </summary> /// </summary>
@ -128,14 +127,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
//else //else
pq[PQHandles[assetID]].data.asset = asset; pq[PQHandles[assetID]].data.asset = asset;
//lock (pq[PQHandles[assetID]].data) //lock (pq[PQHandles[assetID]].data)
pq[PQHandles[assetID]].data.Update((int)pq[PQHandles[assetID]].data.Priority, pq[PQHandles[assetID]].data.CurrentPacket); pq[PQHandles[assetID]].data.Update((int)pq[PQHandles[assetID]].data.Priority, pq[PQHandles[assetID]].data.CurrentPacket);
} }
/// <summary> /// <summary>
@ -147,11 +142,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_shuttingdown) if (m_shuttingdown)
return; return;
IPriorityQueueHandle<Prio<J2KImage>> h = null; IPriorityQueueHandle<Prio<J2KImage>> h = null;
for (int j = 0; j < count; j++) for (int j = 0; j < count; j++)
{ {
lock (pq) lock (pq)
{ {
if (!pq.IsEmpty) if (!pq.IsEmpty)
@ -221,9 +214,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// no module, no layers, full resolution only // no module, no layers, full resolution only
j2kDecodedCallback(process.data.AssetId, new OpenJPEG.J2KLayerInfo[0]); j2kDecodedCallback(process.data.AssetId, new OpenJPEG.J2KLayerInfo[0]);
} }
} // Are we waiting? } // Are we waiting?
else if (!process.data.J2KDecodeWaiting) else if (!process.data.J2KDecodeWaiting)
{ {
@ -357,12 +347,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
lock (PQHandles) lock (PQHandles)
PQHandles.Clear(); PQHandles.Clear();
m_client = null; m_client = null;
} }
} }
/// <summary> /// <summary>
@ -525,7 +513,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
// No layers, send full image // No layers, send full image
DiscardLevel = 0; DiscardLevel = 0;
StopPacket = TexturePacketCount() - 1; StopPacket = TexturePacketCount();
CurrentPacket = Util.Clamp<int>(packet, 1, TexturePacketCount() - 1); CurrentPacket = Util.Clamp<int>(packet, 1, TexturePacketCount() - 1);
} }
} }
@ -604,7 +592,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (Exception e) 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(), 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()); Console.WriteLine(e.ToString());
//m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString()); //m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString());
//m_cancel = true; //m_cancel = true;