From 67e12b95ea7b68f4904a7484d77ecfd787d16d0c Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 30 Oct 2007 09:05:31 +0000
Subject: * Optimized usings * Shortened type references * Removed redundant
 'this' qualifier

---
 .../Environment/Modules/TextureDownloadModule.cs   | 49 ++++++++++------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/TextureDownloadModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 5eeeca6..66c499b 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -27,14 +27,12 @@
 */
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
+using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using Nini.Config;
 
 namespace OpenSim.Region.Environment.Modules
 {
@@ -42,17 +40,19 @@ namespace OpenSim.Region.Environment.Modules
     {
         private Scene m_scene;
         private List<Scene> m_scenes = new List<Scene>();
-        private Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> ClientRequests = new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>();
+
+        private Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> ClientRequests =
+            new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>();
 
         private BlockingQueue<TextureSender> QueueSenders = new BlockingQueue<TextureSender>();
         private Dictionary<LLUUID, List<LLUUID>> InProcess = new Dictionary<LLUUID, List<LLUUID>>();
-       // private Thread m_thread;
+        // private Thread m_thread;
 
         public TextureDownloadModule()
         {
-          //  m_thread = new Thread(new ThreadStart(ProcessTextureSenders));
-          //  m_thread.IsBackground = true;
-          //  m_thread.Start();
+            //  m_thread = new Thread(new ThreadStart(ProcessTextureSenders));
+            //  m_thread.IsBackground = true;
+            //  m_thread.Start();
         }
 
         public void Initialise(Scene scene, IConfigSource config)
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Environment.Modules
 
         public void NewClient(IClientAPI client)
         {
-           /* lock (ClientRequests)
+            /* lock (ClientRequests)
             {
                 if (!ClientRequests.ContainsKey(client.AgentId))
                 {
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Environment.Modules
 
         public void TextureRequest(Object sender, TextureRequestArgs e)
         {
-            IClientAPI client = (IClientAPI)sender;
+            IClientAPI client = (IClientAPI) sender;
             if (!ClientRequests[client.AgentId].ContainsKey(e.RequestedAssetID))
             {
                 lock (ClientRequests)
@@ -136,15 +136,15 @@ namespace OpenSim.Region.Environment.Modules
         {
             while (true)
             {
-                TextureSender sender = this.QueueSenders.Dequeue();
+                TextureSender sender = QueueSenders.Dequeue();
                 bool finished = sender.SendTexture();
                 if (finished)
                 {
-                    this.TextureSent(sender);
+                    TextureSent(sender);
                 }
                 else
                 {
-                    this.QueueSenders.Enqueue(sender);
+                    QueueSenders.Enqueue(sender);
                 }
             }
         }
@@ -173,13 +173,13 @@ namespace OpenSim.Region.Environment.Modules
 
                 if (asset.Data.LongLength > 600)
                 {
-                    NumPackets = 2 + (int)(asset.Data.Length - 601) / 1000;
+                    NumPackets = 2 + (int) (asset.Data.Length - 601)/1000;
                 }
                 else
                 {
                     NumPackets = 1;
                 }
-                
+
                 PacketCounter = (int) req.PacketNumber;
             }
 
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Environment.Modules
                         im.Header.Reliable = false;
                         im.ImageID.Packets = 1;
                         im.ImageID.ID = m_asset.FullID;
-                        im.ImageID.Size = (uint)m_asset.Data.Length;
+                        im.ImageID.Size = (uint) m_asset.Data.Length;
                         im.ImageData.Data = m_asset.Data;
                         im.ImageID.Codec = 2;
                         req.RequestUser.OutPacket(im);
@@ -215,9 +215,9 @@ namespace OpenSim.Region.Environment.Modules
                     {
                         ImageDataPacket im = new ImageDataPacket();
                         im.Header.Reliable = false;
-                        im.ImageID.Packets = (ushort)(NumPackets);
+                        im.ImageID.Packets = (ushort) (NumPackets);
                         im.ImageID.ID = m_asset.FullID;
-                        im.ImageID.Size = (uint)m_asset.Data.Length;
+                        im.ImageID.Size = (uint) m_asset.Data.Length;
                         im.ImageData.Data = new byte[600];
                         Array.Copy(m_asset.Data, 0, im.ImageData.Data, 0, 600);
                         im.ImageID.Codec = 2;
@@ -229,18 +229,16 @@ namespace OpenSim.Region.Environment.Modules
                 {
                     ImagePacketPacket im = new ImagePacketPacket();
                     im.Header.Reliable = false;
-                    im.ImageID.Packet = (ushort)(PacketCounter);
+                    im.ImageID.Packet = (ushort) (PacketCounter);
                     im.ImageID.ID = m_asset.FullID;
-                    int size = m_asset.Data.Length - 600 - (1000 * (PacketCounter - 1));
+                    int size = m_asset.Data.Length - 600 - (1000*(PacketCounter - 1));
                     if (size > 1000) size = 1000;
                     im.ImageData.Data = new byte[size];
-                    Array.Copy(m_asset.Data, 600 + (1000 * (PacketCounter - 1)), im.ImageData.Data, 0, size);
+                    Array.Copy(m_asset.Data, 600 + (1000*(PacketCounter - 1)), im.ImageData.Data, 0, size);
                     req.RequestUser.OutPacket(im);
-                   PacketCounter++;
+                    PacketCounter++;
                 }
-
             }
-
         }
 
         public class AssetRequest
@@ -258,6 +256,5 @@ namespace OpenSim.Region.Environment.Modules
                 PacketNumber = packetNumber;
             }
         }
-        
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1