diff options
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index 6e81632..58c4e04 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | |||
@@ -133,8 +133,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
133 | 133 | ||
134 | pq[PQHandles[assetID]].data.asset = asset; | 134 | pq[PQHandles[assetID]].data.asset = asset; |
135 | 135 | ||
136 | lock (pq[PQHandles[assetID]].data) | 136 | //lock (pq[PQHandles[assetID]].data) |
137 | pq[PQHandles[assetID]].data.Update((int)pq[PQHandles[assetID]].data.Priority, (int)pq[PQHandles[assetID]].data.CurrentPacket); | 137 | pq[PQHandles[assetID]].data.Update((int)pq[PQHandles[assetID]].data.Priority, pq[PQHandles[assetID]].data.CurrentPacket); |
138 | 138 | ||
139 | 139 | ||
140 | 140 | ||
@@ -280,8 +280,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
280 | pq[PQHandles[AssetId]].data.Layers = layers; | 280 | pq[PQHandles[AssetId]].data.Layers = layers; |
281 | pq[PQHandles[AssetId]].data.J2KDecode = true; | 281 | pq[PQHandles[AssetId]].data.J2KDecode = true; |
282 | pq[PQHandles[AssetId]].data.J2KDecodeWaiting = false; | 282 | pq[PQHandles[AssetId]].data.J2KDecodeWaiting = false; |
283 | lock (pq[PQHandles[AssetId]].data) | 283 | //lock (pq[PQHandles[AssetId]].data) |
284 | pq[PQHandles[AssetId]].data.Update((int)pq[PQHandles[AssetId]].data.Priority, (int)pq[PQHandles[AssetId]].data.CurrentPacket); | 284 | pq[PQHandles[AssetId]].data.Update((int)pq[PQHandles[AssetId]].data.Priority, (int)pq[PQHandles[AssetId]].data.CurrentPacket); |
285 | 285 | ||
286 | // Send the first packet | 286 | // Send the first packet |
287 | pq[PQHandles[AssetId]].data.SendPacket(m_client); | 287 | pq[PQHandles[AssetId]].data.SendPacket(m_client); |
@@ -601,7 +601,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
601 | { | 601 | { |
602 | 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(), | 602 | 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(), |
603 | imageData.Length, imagePacketSize, CurrentPacket,StopPacket,TexturePacketCount())); | 603 | imageData.Length, imagePacketSize, CurrentPacket,StopPacket,TexturePacketCount())); |
604 | System.Console.WriteLine(e.ToString()); | 604 | Console.WriteLine(e.ToString()); |
605 | //m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString()); | 605 | //m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString()); |
606 | //m_cancel = true; | 606 | //m_cancel = true; |
607 | //m_sending = false; | 607 | //m_sending = false; |
@@ -639,12 +639,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
639 | 639 | ||
640 | public int CompareTo(Prio<D> that) | 640 | public int CompareTo(Prio<D> that) |
641 | { | 641 | { |
642 | return this.priority.CompareTo(that.priority); | 642 | return priority.CompareTo(that.priority); |
643 | } | 643 | } |
644 | 644 | ||
645 | public bool Equals(Prio<D> that) | 645 | public bool Equals(Prio<D> that) |
646 | { | 646 | { |
647 | return this.priority == that.priority; | 647 | return priority == that.priority; |
648 | } | 648 | } |
649 | 649 | ||
650 | public static Prio<D> operator +(Prio<D> tp, int delta) | 650 | public static Prio<D> operator +(Prio<D> tp, int delta) |