aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-13 16:43:20 +0000
committerJustin Clarke Casey2009-02-13 16:43:20 +0000
commit88b273bc719b5d462069bdfce5782c5dcaf97596 (patch)
tree6272d4413e1645b52ef8250245186fe88cbb2394 /OpenSim/Region/ClientStack
parentfixing crash due to make-child and make-root stepping on each other's toes (diff)
downloadopensim-SC_OLD-88b273bc719b5d462069bdfce5782c5dcaf97596.zip
opensim-SC_OLD-88b273bc719b5d462069bdfce5782c5dcaf97596.tar.gz
opensim-SC_OLD-88b273bc719b5d462069bdfce5782c5dcaf97596.tar.bz2
opensim-SC_OLD-88b273bc719b5d462069bdfce5782c5dcaf97596.tar.xz
* refactor: Move export map function to world map module from scene
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs6
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 6f9e5d3..75b5644 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -266,10 +266,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
266 } 266 }
267 } 267 }
268 } 268 }
269
270 } 269 }
271 270
272
273 /// <summary> 271 /// <summary>
274 /// Callback for when the image has been decoded 272 /// Callback for when the image has been decoded
275 /// </summary> 273 /// </summary>
@@ -281,7 +279,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
281 if (m_shuttingdown) 279 if (m_shuttingdown)
282 return; 280 return;
283 281
284
285 lock (PQHandles) 282 lock (PQHandles)
286 { 283 {
287 // Update our asset data 284 // Update our asset data
@@ -299,7 +296,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
299 } 296 }
300 } 297 }
301 298
302
303 /// <summary> 299 /// <summary>
304 /// This image has had a good life. It's now expired. Remove it off the queue 300 /// This image has had a good life. It's now expired. Remove it off the queue
305 /// </summary> 301 /// </summary>
@@ -531,7 +527,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
531 DiscardLevel = 0; 527 DiscardLevel = 0;
532 StopPacket = TexturePacketCount() - 1; 528 StopPacket = TexturePacketCount() - 1;
533 CurrentPacket = Util.Clamp<int>(packet, 1, TexturePacketCount() - 1); 529 CurrentPacket = Util.Clamp<int>(packet, 1, TexturePacketCount() - 1);
534
535 } 530 }
536 } 531 }
537 532
@@ -562,7 +557,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
562 } 557 }
563 else 558 else
564 { 559 {
565
566 // Send first packet 560 // Send first packet
567 byte[] firstImageData = new byte[FIRST_IMAGE_PACKET_SIZE]; 561 byte[] firstImageData = new byte[FIRST_IMAGE_PACKET_SIZE];
568 try { Buffer.BlockCopy(m_asset_ref.Data, 0, firstImageData, 0, FIRST_IMAGE_PACKET_SIZE); } 562 try { Buffer.BlockCopy(m_asset_ref.Data, 0, firstImageData, 0, FIRST_IMAGE_PACKET_SIZE); }