40 files changed, 832 insertions, 1079 deletions
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index b60ef02..40f4006 100644
--- a/OpenSim/Framework/Communications/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.cs
@@ -37,17 +37,17 @@ namespace OpenSim.Framework.Communications
        public CAPSService(BaseHttpServer httpServer)
        {
            m_server = httpServer;
-            this.AddCapsSeedHandler("/CapsSeed/", CapsRequest);
+            AddCapsSeedHandler("/CapsSeed/", CapsRequest);
        }
        private void AddCapsSeedHandler(string path, RestMethod restMethod)
        {
-            m_server.AddStreamHandler(new RestStreamHandler("POST",  path, restMethod));
+            m_server.AddStreamHandler(new RestStreamHandler("POST", path, restMethod));
        }
        public string CapsRequest(string request, string path, string param)
        {
-            System.Console.WriteLine("new caps request " + request +" from path "+ path);
+            System.Console.WriteLine("new caps request " + request + " from path " + path);
            return "";
        }
    }
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 39e2887..ca2fc35 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -29,12 +29,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
 using OpenSim.Framework.Console;
 namespace OpenSim.Framework.Communications.Cache
@@ -51,18 +48,22 @@ namespace OpenSim.Framework.Communications.Cache
        public Dictionary<LLUUID, AssetInfo> Assets;
        public Dictionary<LLUUID, TextureImage> Textures;
-        public List<AssetRequest> AssetRequests = new List<AssetRequest>();  //assets ready to be sent to viewers
+        public List<AssetRequest> AssetRequests = new List<AssetRequest>(); //assets ready to be sent to viewers
        public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
-        public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); //Assets requested from the asset server
+        public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>();
-        public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>(); //Textures requested from the asset server
+                                                //Assets requested from the asset server
+        public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>();
+                                                //Textures requested from the asset server
        public Dictionary<LLUUID, TextureSender> SendingTextures = new Dictionary<LLUUID, TextureSender>();
        private BlockingQueue<TextureSender> QueueTextures = new BlockingQueue<TextureSender>();
        private Dictionary<LLUUID, List<LLUUID>> AvatarRecievedTextures = new Dictionary<LLUUID, List<LLUUID>>();
-        private Dictionary<LLUUID, Dictionary<LLUUID, int>> TimesTextureSent = new Dictionary<LLUUID, Dictionary<LLUUID, int>>();
+        private Dictionary<LLUUID, Dictionary<LLUUID, int>> TimesTextureSent =
+            new Dictionary<LLUUID, Dictionary<LLUUID, int>>();
        public Dictionary<LLUUID, AssetRequestsList> RequestLists = new Dictionary<LLUUID, AssetRequestsList>();
@@ -76,19 +77,18 @@ namespace OpenSim.Framework.Communications.Cache
        /// </summary>
        public AssetCache(IAssetServer assetServer)
        {
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE","Creating Asset cache");
+            MainLog.Instance.Verbose("ASSETSTORAGE", "Creating Asset cache");
            _assetServer = assetServer;
            _assetServer.SetReceiver(this);
            Assets = new Dictionary<LLUUID, AssetInfo>();
            Textures = new Dictionary<LLUUID, TextureImage>();
-            this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
+            _assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
-            this._assetCacheThread.IsBackground = true;
+            _assetCacheThread.IsBackground = true;
-            this._assetCacheThread.Start();
+            _assetCacheThread.Start();
-            this.TextureSenderThread = new Thread(new ThreadStart(this.ProcessTextureSenders));
-            this.TextureSenderThread.IsBackground = true;
-            this.TextureSenderThread.Start();
+            TextureSenderThread = new Thread(new ThreadStart(ProcessTextureSenders));
+            TextureSenderThread.IsBackground = true;
+            TextureSenderThread.Start();
        }
        /// <summary>
@@ -100,8 +100,8 @@ namespace OpenSim.Framework.Communications.Cache
            {
                try
                {
-                    this.ProcessAssetQueue();
+                    ProcessAssetQueue();
-                    this.ProcessTextureQueue();
+                    ProcessTextureQueue();
                    Thread.Sleep(500);
                }
                catch (Exception e)
@@ -115,13 +115,13 @@ namespace OpenSim.Framework.Communications.Cache
        public AssetBase GetAsset(LLUUID assetID)
        {
            AssetBase asset = null;
-            if (this.Textures.ContainsKey(assetID))
+            if (Textures.ContainsKey(assetID))
            {
-                asset = this.Textures[assetID];
+                asset = Textures[assetID];
            }
-            else if (this.Assets.ContainsKey(assetID))
+            else if (Assets.ContainsKey(assetID))
            {
-                asset = this.Assets[assetID];
+                asset = Assets[assetID];
            }
            return asset;
        }
@@ -129,13 +129,13 @@ namespace OpenSim.Framework.Communications.Cache
        public void GetAsset(LLUUID assetID, AssetRequestCallback callback)
        {
            AssetBase asset = null;
-            if (this.Textures.ContainsKey(assetID))
+            if (Textures.ContainsKey(assetID))
            {
-                asset = this.Textures[assetID];
+                asset = Textures[assetID];
            }
-            else if (this.Assets.ContainsKey(assetID))
+            else if (Assets.ContainsKey(assetID))
            {
-                asset = this.Assets[assetID];
+                asset = Assets[assetID];
            }
            if (asset != null)
@@ -145,7 +145,7 @@ namespace OpenSim.Framework.Communications.Cache
            else
            {
                NewAssetRequest req = new NewAssetRequest(assetID, callback);
-                if (this.RequestLists.ContainsKey(assetID))
+                if (RequestLists.ContainsKey(assetID))
                {
                    lock (RequestLists)
                    {
@@ -161,7 +161,7 @@ namespace OpenSim.Framework.Communications.Cache
                        RequestLists.Add(assetID, reqList);
                    }
                }
-                this._assetServer.FetchAsset(assetID, false);
+                _assetServer.FetchAsset(assetID, false);
            }
        }
@@ -171,22 +171,23 @@ namespace OpenSim.Framework.Communications.Cache
            AssetBase asset = GetAsset(assetID);
            if (asset == null)
            {
-                this._assetServer.FetchAsset(assetID, isTexture);
+                _assetServer.FetchAsset(assetID, isTexture);
            }
            return asset;
        }
        public void AddAsset(AssetBase asset)
        {
-             //System.Console.WriteLine("adding asset " + asset.FullID.ToStringHyphenated());
+            //System.Console.WriteLine("adding asset " + asset.FullID.ToStringHyphenated());
            if (asset.Type == 0)
            {
                //Console.WriteLine("which is a texture");
                if (!Textures.ContainsKey(asset.FullID))
-                { //texture
+                {
+                    //texture
                    TextureImage textur = new TextureImage(asset);
                    Textures.Add(textur.FullID, textur);
-                    if(!asset.Temporary)
+                    if (!asset.Temporary)
                        _assetServer.StoreAndCommitAsset(asset);
                }
                else
@@ -219,49 +220,47 @@ namespace OpenSim.Framework.Communications.Cache
        /// </summary>
        private void ProcessTextureQueue()
        {
-            if (this.TextureRequests.Count == 0)
+            if (TextureRequests.Count == 0)
            {
                //no requests waiting
                return;
            }
            int num;
-            num = this.TextureRequests.Count;
+            num = TextureRequests.Count;
            AssetRequest req;
            for (int i = 0; i < num; i++)
            {
-                req = (AssetRequest)this.TextureRequests[i];
+                req = (AssetRequest) TextureRequests[i];
-                if (!this.SendingTextures.ContainsKey(req.ImageInfo.FullID))
+                if (!SendingTextures.ContainsKey(req.ImageInfo.FullID))
                {
                    //Console.WriteLine("new texture to send");
                    TextureSender sender = new TextureSender(req);
                    //sender.OnComplete += this.TextureSent;
-                    this.SendingTextures.Add(req.ImageInfo.FullID, sender);
+                    SendingTextures.Add(req.ImageInfo.FullID, sender);
-                    this.QueueTextures.Enqueue(sender);
+                    QueueTextures.Enqueue(sender);
                }
            }
-            this.TextureRequests.Clear();
+            TextureRequests.Clear();
        }
        public void ProcessTextureSenders()
        {
            while (true)
            {
-                TextureSender sender = this.QueueTextures.Dequeue();
+                TextureSender sender = QueueTextures.Dequeue();
-             
                bool finished = sender.SendTexture();
                if (finished)
                {
-                    this.TextureSent(sender);
+                    TextureSent(sender);
                }
                else
                {
                    // Console.WriteLine("readding texture");
-                    this.QueueTextures.Enqueue(sender);
+                    QueueTextures.Enqueue(sender);
                }
-             
            }
        }
@@ -271,16 +270,16 @@ namespace OpenSim.Framework.Communications.Cache
        /// <param name="sender"></param>
        public void TextureSent(TextureSender sender)
        {
-            if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
+            if (SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
            {
-                this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
+                SendingTextures.Remove(sender.request.ImageInfo.FullID);
                // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
            }
        }
        public void AssetReceived(AssetBase asset, bool IsTexture)
        {
-            if (asset.FullID != LLUUID.Zero)  // if it is set to zero then the asset wasn't found by the server
+            if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server
            {
                //check if it is a texture or not
                //then add to the correct cache list
@@ -292,48 +291,48 @@ namespace OpenSim.Framework.Communications.Cache
                    //Console.WriteLine("asset  recieved from asset server");
                    TextureImage image = new TextureImage(asset);
-                    if (!this.Textures.ContainsKey(image.FullID))
+                    if (!Textures.ContainsKey(image.FullID))
                    {
-                        this.Textures.Add(image.FullID, image);
+                        Textures.Add(image.FullID, image);
-                        if (this.RequestedTextures.ContainsKey(image.FullID))
+                        if (RequestedTextures.ContainsKey(image.FullID))
                        {
-                            AssetRequest req = this.RequestedTextures[image.FullID];
+                            AssetRequest req = RequestedTextures[image.FullID];
                            req.ImageInfo = image;
                            if (image.Data.LongLength > 600)
                            {
                                //over 600 bytes so split up file
-                                req.NumPackets = 1 + (int)(image.Data.Length - 600) / 1000;
+                                req.NumPackets = 1 + (int) (image.Data.Length - 600)/1000;
                            }
                            else
                            {
                                req.NumPackets = 1;
                            }
-                            this.RequestedTextures.Remove(image.FullID);
+                            RequestedTextures.Remove(image.FullID);
-                            this.TextureRequests.Add(req);
+                            TextureRequests.Add(req);
                        }
                    }
                }
                else
                {
                    AssetInfo assetInf = new AssetInfo(asset);
-                    if (!this.Assets.ContainsKey(assetInf.FullID))
+                    if (!Assets.ContainsKey(assetInf.FullID))
                    {
-                        this.Assets.Add(assetInf.FullID, assetInf);
+                        Assets.Add(assetInf.FullID, assetInf);
-                        if (this.RequestedAssets.ContainsKey(assetInf.FullID))
+                        if (RequestedAssets.ContainsKey(assetInf.FullID))
                        {
-                            AssetRequest req = this.RequestedAssets[assetInf.FullID];
+                            AssetRequest req = RequestedAssets[assetInf.FullID];
                            req.AssetInf = assetInf;
                            if (assetInf.Data.LongLength > 600)
                            {
                                //over 600 bytes so split up file
-                                req.NumPackets = 1 + (int)(assetInf.Data.Length - 600 + 999) / 1000;
+                                req.NumPackets = 1 + (int) (assetInf.Data.Length - 600 + 999)/1000;
                            }
                            else
                            {
                                req.NumPackets = 1;
                            }
-                            this.RequestedAssets.Remove(assetInf.FullID);
+                            RequestedAssets.Remove(assetInf.FullID);
-                            this.AssetRequests.Add(req);
+                            AssetRequests.Add(req);
                        }
                    }
                }
@@ -345,7 +344,7 @@ namespace OpenSim.Framework.Communications.Cache
                    {
                        req.Callback(asset.FullID, asset);
                    }
-                   
                    lock (RequestLists)
                    {
                        RequestLists.Remove(asset.FullID);
@@ -373,6 +372,7 @@ namespace OpenSim.Framework.Communications.Cache
        }
        #region Assets
        /// <summary>
        /// 
        /// </summary>
@@ -396,11 +396,11 @@ namespace OpenSim.Framework.Communications.Cache
            }
            //check to see if asset is in local cache, if not we need to request it from asset server.
            //Console.WriteLine("asset request " + requestID);
-            if (!this.Assets.ContainsKey(requestID))
+            if (!Assets.ContainsKey(requestID))
            {
                //not found asset       
                // so request from asset server
-                if (!this.RequestedAssets.ContainsKey(requestID))
+                if (!RequestedAssets.ContainsKey(requestID))
                {
                    AssetRequest request = new AssetRequest();
                    request.RequestUser = userInfo;
@@ -408,13 +408,13 @@ namespace OpenSim.Framework.Communications.Cache
                    request.TransferRequestID = transferRequest.TransferInfo.TransferID;
                    request.AssetRequestSource = source;
                    request.Params = transferRequest.TransferInfo.Params;
-                    this.RequestedAssets.Add(requestID, request);
+                    RequestedAssets.Add(requestID, request);
-                    this._assetServer.FetchAsset(requestID, false);
+                    _assetServer.FetchAsset(requestID, false);
                }
                return;
            }
            //it is in our cache 
-            AssetInfo asset = this.Assets[requestID];
+            AssetInfo asset = Assets[requestID];
            //work out how many packets it  should be sent in 
            // and add to the AssetRequests list
@@ -429,14 +429,14 @@ namespace OpenSim.Framework.Communications.Cache
            if (asset.Data.LongLength > 600)
            {
                //over 600 bytes so split up file
-                req.NumPackets = 1 + (int)(asset.Data.Length - 600 + 999) / 1000;
+                req.NumPackets = 1 + (int) (asset.Data.Length - 600 + 999)/1000;
            }
            else
            {
                req.NumPackets = 1;
            }
-            this.AssetRequests.Add(req);
+            AssetRequests.Add(req);
        }
        /// <summary>
@@ -444,17 +444,17 @@ namespace OpenSim.Framework.Communications.Cache
        /// </summary>
        private void ProcessAssetQueue()
        {
-            if (this.AssetRequests.Count == 0)
+            if (AssetRequests.Count == 0)
            {
                //no requests waiting
                return;
            }
            int num;
-            if (this.AssetRequests.Count < 5)
+            if (AssetRequests.Count < 5)
            {
                //lower than 5 so do all of them
-                num = this.AssetRequests.Count;
+                num = AssetRequests.Count;
            }
            else
            {
@@ -463,7 +463,7 @@ namespace OpenSim.Framework.Communications.Cache
            AssetRequest req;
            for (int i = 0; i < num; i++)
            {
-                req = (AssetRequest)this.AssetRequests[i];
+                req = (AssetRequest) AssetRequests[i];
                //Console.WriteLine("sending asset " + req.RequestAssetID);
                TransferInfoPacket Transfer = new TransferInfoPacket();
                Transfer.TransferInfo.ChannelType = 2;
@@ -473,7 +473,7 @@ namespace OpenSim.Framework.Communications.Cache
                {
                    Transfer.TransferInfo.Params = new byte[20];
                    Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
-                    int assType = (int)req.AssetInf.Type;
+                    int assType = (int) req.AssetInf.Type;
                    Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
                }
                else if (req.AssetRequestSource == 3)
@@ -483,7 +483,7 @@ namespace OpenSim.Framework.Communications.Cache
                    //Array.Copy(req.RequestUser.AgentId.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
                    //Array.Copy(req.RequestUser.SessionId.GetBytes(), 0, Transfer.TransferInfo.Params, 16, 16);
                }
-                Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
+                Transfer.TransferInfo.Size = (int) req.AssetInf.Data.Length;
                Transfer.TransferInfo.TransferID = req.TransferRequestID;
                req.RequestUser.OutPacket(Transfer);
@@ -533,19 +533,19 @@ namespace OpenSim.Framework.Communications.Cache
                        req.RequestUser.OutPacket(TransferPacket);
                    }
                }
            }
            //remove requests that have been completed
            for (int i = 0; i < num; i++)
            {
-                this.AssetRequests.RemoveAt(0);
+                AssetRequests.RemoveAt(0);
            }
        }
        #endregion
        #region Textures
        /// <summary>
        /// 
        /// </summary>
@@ -553,21 +553,21 @@ namespace OpenSim.Framework.Communications.Cache
        /// <param name="imageID"></param>
        public void AddTextureRequest(IClientAPI userInfo, LLUUID imageID, uint packetNumber, int discard)
        {
-          // System.Console.WriteLine("texture request for " + imageID.ToStringHyphenated() + " packetnumber= " + packetNumber);
+            // System.Console.WriteLine("texture request for " + imageID.ToStringHyphenated() + " packetnumber= " + packetNumber);
            //check to see if texture is in local cache, if not request from asset server
-            if (!this.AvatarRecievedTextures.ContainsKey(userInfo.AgentId))
+            if (!AvatarRecievedTextures.ContainsKey(userInfo.AgentId))
            {
-                this.AvatarRecievedTextures.Add(userInfo.AgentId, new List<LLUUID>());
+                AvatarRecievedTextures.Add(userInfo.AgentId, new List<LLUUID>());
            }
            /* if(this.AvatarRecievedTextures[userInfo.AgentId].Contains(imageID))
             {
                 //Console.WriteLine(userInfo.AgentId +" is requesting a image( "+ imageID+" that has already been sent to them");
                 return;
             }*/
-       
-            if (!this.Textures.ContainsKey(imageID))
+            if (!Textures.ContainsKey(imageID))
            {
-                if (!this.RequestedTextures.ContainsKey(imageID))
+                if (!RequestedTextures.ContainsKey(imageID))
                {
                    //not is cache so request from asset server
                    AssetRequest request = new AssetRequest();
@@ -575,14 +575,14 @@ namespace OpenSim.Framework.Communications.Cache
                    request.RequestAssetID = imageID;
                    request.IsTextureRequest = true;
                    request.DiscardLevel = discard;
-                    this.RequestedTextures.Add(imageID, request);
+                    RequestedTextures.Add(imageID, request);
-                    this._assetServer.FetchAsset(imageID, true);
+                    _assetServer.FetchAsset(imageID, true);
                }
                return;
            }
-           // System.Console.WriteLine("texture already in cache");
+            // System.Console.WriteLine("texture already in cache");
-            TextureImage imag = this.Textures[imageID];
+            TextureImage imag = Textures[imageID];
            AssetRequest req = new AssetRequest();
            req.RequestUser = userInfo;
            req.RequestAssetID = imageID;
@@ -594,7 +594,7 @@ namespace OpenSim.Framework.Communications.Cache
            {
                //Console.WriteLine("{0}", imag.Data.LongLength);
                //over 600 bytes so split up file
-                req.NumPackets = 2 + (int)(imag.Data.Length - 601) / 1000;
+                req.NumPackets = 2 + (int) (imag.Data.Length - 601)/1000;
                //Console.WriteLine("texture is " + imag.Data.Length + " which we will send in " +req.NumPackets +" packets");
            }
            else
@@ -603,12 +603,11 @@ namespace OpenSim.Framework.Communications.Cache
            }
            if (packetNumber != 0)
            {
-                req.PacketCounter = (int)packetNumber;
+                req.PacketCounter = (int) packetNumber;
            }
-            this.TextureRequests.Add(req);
+            TextureRequests.Add(req);
        }
-      
        #endregion
        public class AssetRequest
@@ -630,7 +629,6 @@ namespace OpenSim.Framework.Communications.Cache
            public AssetRequest()
            {
            }
        }
@@ -638,7 +636,6 @@ namespace OpenSim.Framework.Communications.Cache
        {
            public AssetInfo()
            {
            }
            public AssetInfo(AssetBase aBase)
@@ -656,7 +653,6 @@ namespace OpenSim.Framework.Communications.Cache
        {
            public TextureImage()
            {
            }
            public TextureImage(AssetBase aBase)
@@ -678,7 +674,6 @@ namespace OpenSim.Framework.Communications.Cache
            public TextureSender(AssetRequest req)
            {
                request = req;
            }
            public bool SendTexture()
@@ -686,7 +681,8 @@ namespace OpenSim.Framework.Communications.Cache
                SendPacket();
                counter++;
-                if ((request.PacketCounter >= request.NumPackets) | counter > 100 | (request.NumPackets == 1) | (request.DiscardLevel == -1))
+                if ((request.PacketCounter >= request.NumPackets) | counter > 100 | (request.NumPackets == 1) |
+                    (request.DiscardLevel == -1))
                {
                    return true;
                }
@@ -707,7 +703,7 @@ namespace OpenSim.Framework.Communications.Cache
                        im.Header.Reliable = false;
                        im.ImageID.Packets = 1;
                        im.ImageID.ID = req.ImageInfo.FullID;
-                        im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
+                        im.ImageID.Size = (uint) req.ImageInfo.Data.Length;
                        im.ImageData.Data = req.ImageInfo.Data;
                        im.ImageID.Codec = 2;
                        req.RequestUser.OutPacket(im);
@@ -721,9 +717,9 @@ namespace OpenSim.Framework.Communications.Cache
                        //more than one packet so split file up
                        ImageDataPacket im = new ImageDataPacket();
                        im.Header.Reliable = false;
-                        im.ImageID.Packets = (ushort)(req.NumPackets);
+                        im.ImageID.Packets = (ushort) (req.NumPackets);
                        im.ImageID.ID = req.ImageInfo.FullID;
-                        im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
+                        im.ImageID.Size = (uint) req.ImageInfo.Data.Length;
                        im.ImageData.Data = new byte[600];
                        Array.Copy(req.ImageInfo.Data, 0, im.ImageData.Data, 0, 600);
                        im.ImageID.Codec = 2;
@@ -742,19 +738,18 @@ namespace OpenSim.Framework.Communications.Cache
                    //more than one packet so split file up
                    ImagePacketPacket im = new ImagePacketPacket();
                    im.Header.Reliable = false;
-                    im.ImageID.Packet = (ushort)(req.PacketCounter);
+                    im.ImageID.Packet = (ushort) (req.PacketCounter);
                    im.ImageID.ID = req.ImageInfo.FullID;
-                    int size = req.ImageInfo.Data.Length - 600 - (1000 * (req.PacketCounter - 1));
+                    int size = req.ImageInfo.Data.Length - 600 - (1000*(req.PacketCounter - 1));
                    if (size > 1000) size = 1000;
                    //Console.WriteLine("length= {0} counter= {1} size= {2}",req.ImageInfo.Data.Length, req.PacketCounter, size);
                    im.ImageData.Data = new byte[size];
-                    Array.Copy(req.ImageInfo.Data, 600 + (1000 * (req.PacketCounter - 1)), im.ImageData.Data, 0, size);
+                    Array.Copy(req.ImageInfo.Data, 600 + (1000*(req.PacketCounter - 1)), im.ImageData.Data, 0, size);
                    req.RequestUser.OutPacket(im);
                    req.PacketCounter++;
                    //req.ImageInfo.last_used = time;
                    //System.Console.WriteLine("sent a packet of texture: "+req.ImageInfo.FullID);
                }
            }
            private void SaveAssetToFile(string filename, byte[] data)
@@ -789,7 +784,5 @@ namespace OpenSim.Framework.Communications.Cache
            AssetID = assetID;
            Callback = callback;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index c927571..fa421c7 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -25,18 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Threading;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 using libsecondlife;
-using Nini.Config;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -50,7 +43,7 @@ namespace OpenSim.Framework.Communications.Cache
            yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));
            db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap"));
-            MainLog.Instance.Verbose("ASSETS","Db4 Asset database  creation");
+            MainLog.Instance.Verbose("ASSETS", "Db4 Asset database  creation");
            if (!yapfile)
            {
@@ -68,29 +61,29 @@ namespace OpenSim.Framework.Communications.Cache
            db.Commit();
        }
-        override public void Close()
+        public override void Close()
        {
            base.Close();
            if (db != null)
            {
-                MainLog.Instance.Verbose("ASSETSERVER","Closing local asset server database");
+                MainLog.Instance.Verbose("ASSETSERVER", "Closing local asset server database");
                db.Close();
            }
        }
-        override  protected void RunRequests()
+        protected override void RunRequests()
        {
            while (true)
            {
                byte[] idata = null;
                bool found = false;
                AssetStorage foundAsset = null;
-                ARequest req = this._assetRequests.Dequeue();
+                ARequest req = _assetRequests.Dequeue();
                IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID));
                if (result.Count > 0)
                {
-                    foundAsset = (AssetStorage)result.Next();
+                    foundAsset = (AssetStorage) result.Next();
                    found = true;
                }
@@ -110,12 +103,10 @@ namespace OpenSim.Framework.Communications.Cache
                    //asset.FullID = ;
                    _receiver.AssetNotFound(req.AssetID);
                }
            }
        }
-        override protected void StoreAsset(AssetBase asset)
+        protected override void StoreAsset(AssetBase asset)
        {
            AssetStorage store = new AssetStorage();
            store.Data = asset.Data;
@@ -148,6 +139,7 @@ namespace OpenSim.Framework.Communications.Cache
        {
            _findID = find;
        }
        public bool Match(AssetStorage asset)
        {
            return (asset.UUID == _findID);
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 0771a20..7109910 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -5,8 +5,6 @@ using System.Threading;
 using libsecondlife;
 using Nini.Config;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -36,13 +34,12 @@ namespace OpenSim.Framework.Communications.Cache
        public AssetServerBase()
        {
+            MainLog.Instance.Verbose("ASSETSERVER", "Starting asset storage system");
+            _assetRequests = new BlockingQueue<ARequest>();
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting asset storage system");
+            _localAssetServerThread = new Thread(RunRequests);
-            this._assetRequests = new BlockingQueue<ARequest>();
+            _localAssetServerThread.IsBackground = true;
+            _localAssetServerThread.Start();
-            this._localAssetServerThread = new Thread(RunRequests);
-            this._localAssetServerThread.IsBackground = true;
-            this._localAssetServerThread.Start();
        }
        public void LoadAsset(AssetBase info, bool image, string filename)
@@ -57,7 +54,7 @@ namespace OpenSim.Framework.Communications.Cache
            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
            byte[] idata = new byte[numBytes];
            BinaryReader br = new BinaryReader(fStream);
-            idata = br.ReadBytes((int)numBytes);
+            idata = br.ReadBytes((int) numBytes);
            br.Close();
            fStream.Close();
            info.Data = idata;
@@ -66,7 +63,7 @@ namespace OpenSim.Framework.Communications.Cache
        public void SetReceiver(IAssetReceiver receiver)
        {
-            this._receiver = receiver;
+            _receiver = receiver;
        }
        public void FetchAsset(LLUUID assetID, bool isTexture)
@@ -74,7 +71,7 @@ namespace OpenSim.Framework.Communications.Cache
            ARequest req = new ARequest();
            req.AssetID = assetID;
            req.IsTexture = isTexture;
-            this._assetRequests.Enqueue(req);
+            _assetRequests.Enqueue(req);
        }
        public void UpdateAsset(AssetBase asset)
@@ -102,7 +99,6 @@ namespace OpenSim.Framework.Communications.Cache
        public void SetServerInfo(string ServerUrl, string ServerKey)
        {
        }
        public virtual List<AssetBase> GetDefaultAssets()
@@ -175,8 +171,8 @@ namespace OpenSim.Framework.Communications.Cache
                    // System.Console.WriteLine("loading asset into database");
                    string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());
                    string name = source.Configs[i].GetString("name", "");
-                    sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0);
+                    sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
-                    sbyte invType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
+                    sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
                    string fileName = source.Configs[i].GetString("fileName", "");
                    AssetBase newAsset = CreateAsset(assetIdStr, name, fileName, false);
@@ -189,4 +185,4 @@ namespace OpenSim.Framework.Communications.Cache
            assets.ForEach(action);
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
index d622e02..55b255a 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
@@ -25,15 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
-using OpenSim.Framework.Data;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -41,7 +34,10 @@ namespace OpenSim.Framework.Communications.Cache
    {
        // Fields
        public CommunicationsManager CommsManager;
-        public Dictionary<LLUUID, AgentAssetTransactions> AgentTransactions = new Dictionary<LLUUID, AgentAssetTransactions>();
+        public Dictionary<LLUUID, AgentAssetTransactions> AgentTransactions =
+            new Dictionary<LLUUID, AgentAssetTransactions>();
        private bool m_dumpAssetsToFile;
        public AssetTransactionManager(CommunicationsManager commsManager, bool dumpAssetsToFile)
@@ -53,10 +49,10 @@ namespace OpenSim.Framework.Communications.Cache
        // Methods
        public AgentAssetTransactions AddUser(LLUUID userID)
        {
-            if (!this.AgentTransactions.ContainsKey(userID))
+            if (!AgentTransactions.ContainsKey(userID))
            {
                AgentAssetTransactions transactions = new AgentAssetTransactions(userID, this, m_dumpAssetsToFile);
-                this.AgentTransactions.Add(userID, transactions);
+                AgentTransactions.Add(userID, transactions);
                return transactions;
            }
            return null;
@@ -64,27 +60,30 @@ namespace OpenSim.Framework.Communications.Cache
        public AgentAssetTransactions GetUserTransActions(LLUUID userID)
        {
-            if (this.AgentTransactions.ContainsKey(userID))
+            if (AgentTransactions.ContainsKey(userID))
            {
-                return this.AgentTransactions[userID];
+                return AgentTransactions[userID];
            }
            return null;
        }
-        public void HandleInventoryFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask)
+        public void HandleInventoryFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID,
+                                                   uint callbackID, string description, string name, sbyte invType,
+                                                   sbyte type, byte wearableType, uint nextOwnerMask)
        {
-            AgentAssetTransactions transactions = this.GetUserTransActions(remoteClient.AgentId);
+            AgentAssetTransactions transactions = GetUserTransActions(remoteClient.AgentId);
            if (transactions != null)
            {
-                transactions.RequestCreateInventoryItem(remoteClient, transactionID, folderID, callbackID, description, name, invType, type, wearableType, nextOwnerMask);
+                transactions.RequestCreateInventoryItem(remoteClient, transactionID, folderID, callbackID, description,
+                                                        name, invType, type, wearableType, nextOwnerMask);
            }
        }
-        public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal)
+        public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type,
+                                           byte[] data, bool storeLocal)
        {
            // Console.WriteLine("asset upload of " + assetID);
-            AgentAssetTransactions transactions = this.GetUserTransActions(remoteClient.AgentId);
+            AgentAssetTransactions transactions = GetUserTransActions(remoteClient.AgentId);
            if (transactions != null)
            {
                AgentAssetTransactions.AssetXferUploader uploader = transactions.RequestXferUploader(transaction);
@@ -97,7 +96,7 @@ namespace OpenSim.Framework.Communications.Cache
        public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
        {
-            AgentAssetTransactions transactions = this.GetUserTransActions(remoteClient.AgentId);
+            AgentAssetTransactions transactions = GetUserTransActions(remoteClient.AgentId);
            if (transactions != null)
            {
                transactions.HandleXfer(xferID, packetID, data);
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index e78f4f7..6b08fc9 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -26,17 +26,12 @@
 * 
 */
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
-using OpenSim.Region.Capabilities;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Capabilities;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -53,7 +48,7 @@ namespace OpenSim.Framework.Communications.Cache
        // Methods
        public AgentAssetTransactions(LLUUID agentID, AssetTransactionManager manager, bool dumpAssetsToFile)
        {
-            this.UserID = agentID;
+            UserID = agentID;
            Manager = manager;
            m_dumpAssetsToFile = dumpAssetsToFile;
        }
@@ -61,24 +56,24 @@ namespace OpenSim.Framework.Communications.Cache
        public AssetCapsUploader RequestCapsUploader()
        {
            AssetCapsUploader uploader = new AssetCapsUploader();
-            this.CapsUploaders.Add(uploader);
+            CapsUploaders.Add(uploader);
            return uploader;
        }
        public NoteCardCapsUpdate RequestNoteCardUpdater()
        {
            NoteCardCapsUpdate update = new NoteCardCapsUpdate();
-            this.NotecardUpdaters.Add(update);
+            NotecardUpdaters.Add(update);
            return update;
        }
        public AssetXferUploader RequestXferUploader(LLUUID transactionID)
        {
-            if (!this.XferUploaders.ContainsKey(transactionID))
+            if (!XferUploaders.ContainsKey(transactionID))
            {
                AssetXferUploader uploader = new AssetXferUploader(this, m_dumpAssetsToFile);
-                this.XferUploaders.Add(transactionID, uploader);
+                XferUploaders.Add(transactionID, uploader);
                return uploader;
            }
            return null;
@@ -86,7 +81,7 @@ namespace OpenSim.Framework.Communications.Cache
        public void HandleXfer(ulong xferID, uint packetID, byte[] data)
        {
-            foreach (AssetXferUploader uploader in this.XferUploaders.Values)
+            foreach (AssetXferUploader uploader in XferUploaders.Values)
            {
                if (uploader.XferID == xferID)
                {
@@ -96,17 +91,21 @@ namespace OpenSim.Framework.Communications.Cache
            }
        }
-        public void RequestCreateInventoryItem(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask)
+        public void RequestCreateInventoryItem(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID,
+                                               uint callbackID, string description, string name, sbyte invType,
+                                               sbyte type, byte wearableType, uint nextOwnerMask)
        {
-            if (this.XferUploaders.ContainsKey(transactionID))
+            if (XferUploaders.ContainsKey(transactionID))
            {
-                this.XferUploaders[transactionID].RequestCreateInventoryItem(remoteClient, transactionID, folderID, callbackID, description, name, invType, type, wearableType, nextOwnerMask);
+                XferUploaders[transactionID].RequestCreateInventoryItem(remoteClient, transactionID, folderID,
+                                                                        callbackID, description, name, invType, type,
+                                                                        wearableType, nextOwnerMask);
            }
        }
        public AssetBase GetTransactionAsset(LLUUID transactionID)
        {
-            if (this.XferUploaders.ContainsKey(transactionID))
+            if (XferUploaders.ContainsKey(transactionID))
            {
                return XferUploaders[transactionID].GetAssetData();
            }
@@ -130,15 +129,16 @@ namespace OpenSim.Framework.Communications.Cache
            public event UpLoadedAsset OnUpLoad;
            // Methods
-            public void Initialise(string assetName, string assetDescription, LLUUID assetID, LLUUID inventoryItem, LLUUID folderID, string path, BaseHttpServer httpServer, bool dumpImageToFile)
+            public void Initialise(string assetName, string assetDescription, LLUUID assetID, LLUUID inventoryItem,
+                                   LLUUID folderID, string path, BaseHttpServer httpServer, bool dumpImageToFile)
            {
-                this.m_assetName = assetName;
+                m_assetName = assetName;
-                this.m_assetDescription = assetDescription;
+                m_assetDescription = assetDescription;
-                this.m_folderID = folderID;
+                m_folderID = folderID;
-                this.newAssetID = assetID;
+                newAssetID = assetID;
-                this.inventoryItemID = inventoryItem;
+                inventoryItemID = inventoryItem;
-                this.uploaderPath = path;
+                uploaderPath = path;
-                this.httpListener = httpServer;
+                httpListener = httpServer;
                m_dumpImageToFile = dumpImageToFile;
            }
@@ -156,18 +156,18 @@ namespace OpenSim.Framework.Communications.Cache
                LLUUID inventoryItemID = this.inventoryItemID;
                string text = "";
                LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
-                complete.new_asset = this.newAssetID.ToStringHyphenated();
+                complete.new_asset = newAssetID.ToStringHyphenated();
                complete.new_inventory_item = inventoryItemID;
                complete.state = "complete";
                text = LLSDHelpers.SerialiseLLSDReply(complete);
-                this.httpListener.RemoveStreamHandler("POST", this.uploaderPath);
+                httpListener.RemoveStreamHandler("POST", uploaderPath);
-                if (this.m_dumpImageToFile)
+                if (m_dumpImageToFile)
                {
-                    this.SaveImageToFile(this.m_assetName + ".jp2", data);
+                    SaveImageToFile(m_assetName + ".jp2", data);
                }
-                if (this.OnUpLoad != null)
+                if (OnUpLoad != null)
                {
-                    this.OnUpLoad(this.m_assetName, "description", this.newAssetID, inventoryItemID, LLUUID.Zero, data, "" , "");
+                    OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", "");
                }
                return text;
            }
@@ -196,90 +196,91 @@ namespace OpenSim.Framework.Communications.Cache
            public AssetXferUploader(AgentAssetTransactions transactions, bool dumpAssetToFile)
            {
-                this.m_userTransactions = transactions;
+                m_userTransactions = transactions;
                m_dumpAssetToFile = dumpAssetToFile;
            }
            // Methods
            public void HandleXferPacket(ulong xferID, uint packetID, byte[] data)
            {
-                if (this.XferID == xferID)
+                if (XferID == xferID)
                {
-                    if (this.Asset.Data.Length > 1)
+                    if (Asset.Data.Length > 1)
                    {
-                        byte[] destinationArray = new byte[this.Asset.Data.Length + data.Length];
+                        byte[] destinationArray = new byte[Asset.Data.Length + data.Length];
-                        Array.Copy(this.Asset.Data, 0, destinationArray, 0, this.Asset.Data.Length);
+                        Array.Copy(Asset.Data, 0, destinationArray, 0, Asset.Data.Length);
-                        Array.Copy(data, 0, destinationArray, this.Asset.Data.Length, data.Length);
+                        Array.Copy(data, 0, destinationArray, Asset.Data.Length, data.Length);
-                        this.Asset.Data = destinationArray;
+                        Asset.Data = destinationArray;
                    }
                    else
                    {
                        byte[] buffer2 = new byte[data.Length - 4];
                        Array.Copy(data, 4, buffer2, 0, data.Length - 4);
-                        this.Asset.Data = buffer2;
+                        Asset.Data = buffer2;
                    }
                    ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket();
                    newPack.XferID.ID = xferID;
                    newPack.XferID.Packet = packetID;
-                    this.ourClient.OutPacket(newPack);
+                    ourClient.OutPacket(newPack);
                    if ((packetID & 0x80000000) != 0)
                    {
-                        this.SendCompleteMessage();
+                        SendCompleteMessage();
                    }
                }
            }
-            public void Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal)
+            public void Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data,
+                                   bool storeLocal)
            {
-                this.ourClient = remoteClient;
+                ourClient = remoteClient;
-                this.Asset = new AssetBase();
+                Asset = new AssetBase();
-                this.Asset.FullID = assetID;
+                Asset.FullID = assetID;
-                this.Asset.InvType = type;
+                Asset.InvType = type;
-                this.Asset.Type = type;
+                Asset.Type = type;
-                this.Asset.Data = data;
+                Asset.Data = data;
-                this.Asset.Name = "blank";
+                Asset.Name = "blank";
-                this.Asset.Description = "empty";
+                Asset.Description = "empty";
-                this.TransactionID = transaction;
+                TransactionID = transaction;
-                this.m_storeLocal = storeLocal;
+                m_storeLocal = storeLocal;
-                if (this.Asset.Data.Length > 2)
+                if (Asset.Data.Length > 2)
                {
-                    this.SendCompleteMessage();
+                    SendCompleteMessage();
                }
                else
                {
-                    this.ReqestStartXfer();
+                    ReqestStartXfer();
                }
            }
            protected void ReqestStartXfer()
            {
-                this.UploadComplete = false;
+                UploadComplete = false;
-                this.XferID = Util.GetNextXferID();
+                XferID = Util.GetNextXferID();
                RequestXferPacket newPack = new RequestXferPacket();
-                newPack.XferID.ID = this.XferID;
+                newPack.XferID.ID = XferID;
-                newPack.XferID.VFileType = this.Asset.Type;
+                newPack.XferID.VFileType = Asset.Type;
-                newPack.XferID.VFileID = this.Asset.FullID;
+                newPack.XferID.VFileID = Asset.FullID;
                newPack.XferID.FilePath = 0;
                newPack.XferID.Filename = new byte[0];
-                this.ourClient.OutPacket(newPack);
+                ourClient.OutPacket(newPack);
            }
            protected void SendCompleteMessage()
            {
-                this.UploadComplete = true;
+                UploadComplete = true;
                AssetUploadCompletePacket newPack = new AssetUploadCompletePacket();
-                newPack.AssetBlock.Type = this.Asset.Type;
+                newPack.AssetBlock.Type = Asset.Type;
                newPack.AssetBlock.Success = true;
-                newPack.AssetBlock.UUID = this.Asset.FullID;
+                newPack.AssetBlock.UUID = Asset.FullID;
-                this.ourClient.OutPacket(newPack);
+                ourClient.OutPacket(newPack);
-                this.m_finished = true;
+                m_finished = true;
                if (m_createItem)
                {
                    DoCreateItem();
                }
                else if (m_storeLocal)
                {
-                    this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
+                    m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(Asset);
                }
                // Console.WriteLine("upload complete "+ this.TransactionID);
@@ -287,8 +288,10 @@ namespace OpenSim.Framework.Communications.Cache
                if (m_dumpAssetToFile)
                {
                    DateTime now = DateTime.Now;
-                    string filename = String.Format("{6}_{7}_{0:d2}{1:d2}{2:d2}_{3:d2}{4:d2}{5:d2}", now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, Asset.Name, Asset.Type );
+                    string filename =
-                    SaveAssetToFile(filename, this.Asset.Data);
+                        String.Format("{6}_{7}_{0:d2}{1:d2}{2:d2}_{3:d2}{4:d2}{5:d2}", now.Year, now.Month, now.Day,
+                                      now.Hour, now.Minute, now.Second, Asset.Name, Asset.Type);
+                    SaveAssetToFile(filename, Asset.Data);
                }
            }
@@ -301,20 +304,22 @@ namespace OpenSim.Framework.Communications.Cache
                fs.Close();
            }
-            public void RequestCreateInventoryItem(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask)
+            public void RequestCreateInventoryItem(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID,
+                                                   uint callbackID, string description, string name, sbyte invType,
+                                                   sbyte type, byte wearableType, uint nextOwnerMask)
            {
-                if (this.TransactionID == transactionID)
+                if (TransactionID == transactionID)
                {
-                    this.InventFolder = folderID;
+                    InventFolder = folderID;
-                    this.m_name = name;
+                    m_name = name;
-                    this.m_description = description;
+                    m_description = description;
                    this.type = type;
                    this.invType = invType;
-                    this.nextPerm = nextOwnerMask;
+                    nextPerm = nextOwnerMask;
-                    this.Asset.Name = name;
+                    Asset.Name = name;
-                    this.Asset.Description = description;
+                    Asset.Description = description;
-                    this.Asset.Type = type;
+                    Asset.Type = type;
-                    this.Asset.InvType = invType;
+                    Asset.InvType = invType;
                    m_createItem = true;
                    if (m_finished)
                    {
@@ -326,22 +331,23 @@ namespace OpenSim.Framework.Communications.Cache
            private void DoCreateItem()
            {
                //really need to fix this call, if lbsa71 saw this he would die. 
-                this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
+                m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(Asset);
-                CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfileCache.GetUserDetails(ourClient.AgentId);
+                CachedUserInfo userInfo =
+                    m_userTransactions.Manager.CommsManager.UserProfileCache.GetUserDetails(ourClient.AgentId);
                if (userInfo != null)
                {
                    InventoryItemBase item = new InventoryItemBase();
-                    item.avatarID = this.ourClient.AgentId;
+                    item.avatarID = ourClient.AgentId;
                    item.creatorsID = ourClient.AgentId;
                    item.inventoryID = LLUUID.Random();
                    item.assetID = Asset.FullID;
-                    item.inventoryDescription = this.m_description;
+                    item.inventoryDescription = m_description;
                    item.inventoryName = m_name;
                    item.assetType = type;
-                    item.invType = this.invType;
+                    item.invType = invType;
-                    item.parentFolderID = this.InventFolder;
+                    item.parentFolderID = InventFolder;
                    item.inventoryCurrentPermissions = 2147483647;
-                    item.inventoryNextPermissions = this.nextPerm;
+                    item.inventoryNextPermissions = nextPerm;
                    userInfo.AddItem(ourClient.AgentId, item);
                    ourClient.SendInventoryItemUpdate(item);
@@ -350,14 +356,13 @@ namespace OpenSim.Framework.Communications.Cache
            public void UpdateInventoryItem(LLUUID itemID)
            {
            }
            public AssetBase GetAssetData()
            {
                if (m_finished)
                {
-                    return this.Asset;
+                    return Asset;
                }
                return null;
            }
@@ -379,10 +384,10 @@ namespace OpenSim.Framework.Communications.Cache
            // Methods
            public void Initialise(LLUUID inventoryItem, string path, BaseHttpServer httpServer)
            {
-                this.inventoryItemID = inventoryItem;
+                inventoryItemID = inventoryItem;
-                this.uploaderPath = path;
+                uploaderPath = path;
-                this.httpListener = httpServer;
+                httpListener = httpServer;
-                this.newAssetID = LLUUID.Random();
+                newAssetID = LLUUID.Random();
            }
            private void SaveImageToFile(string filename, byte[] data)
@@ -399,18 +404,18 @@ namespace OpenSim.Framework.Communications.Cache
                LLUUID inventoryItemID = this.inventoryItemID;
                string text = "";
                LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
-                complete.new_asset = this.newAssetID.ToStringHyphenated();
+                complete.new_asset = newAssetID.ToStringHyphenated();
                complete.new_inventory_item = inventoryItemID;
                complete.state = "complete";
                text = LLSDHelpers.SerialiseLLSDReply(complete);
-                this.httpListener.RemoveStreamHandler("POST", this.uploaderPath);
+                httpListener.RemoveStreamHandler("POST", uploaderPath);
-                if (this.SaveImages)
+                if (SaveImages)
                {
-                    this.SaveImageToFile(this.m_assetName + "notecard.txt", data);
+                    SaveImageToFile(m_assetName + "notecard.txt", data);
                }
-                if (this.OnUpLoad != null)
+                if (OnUpLoad != null)
                {
-                    this.OnUpLoad(this.m_assetName, "description", this.newAssetID, inventoryItemID, LLUUID.Zero, data, "" , "" );
+                    OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", "");
                }
                return text;
            }
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 2d639d6..8fbc3fd 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -26,7 +26,6 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -45,22 +44,22 @@ namespace OpenSim.Framework.Communications.Cache
        // Methods
        public void FolderReceive(LLUUID userID, InventoryFolderImpl folderInfo)
        {
-            if (userID == this.UserProfile.UUID)
+            if (userID == UserProfile.UUID)
            {
-                if (this.RootFolder == null)
+                if (RootFolder == null)
                {
                    if (folderInfo.parentID == LLUUID.Zero)
                    {
-                        this.RootFolder = folderInfo;
+                        RootFolder = folderInfo;
                    }
                }
-                else if (this.RootFolder.folderID == folderInfo.parentID)
+                else if (RootFolder.folderID == folderInfo.parentID)
                {
-                    this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
+                    RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
                }
                else
                {
-                    InventoryFolderImpl folder = this.RootFolder.HasSubFolder(folderInfo.parentID);
+                    InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.parentID);
                    if (folder != null)
                    {
                        folder.SubFolders.Add(folderInfo.folderID, folderInfo);
@@ -71,18 +70,18 @@ namespace OpenSim.Framework.Communications.Cache
        public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
        {
-            if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
+            if ((userID == UserProfile.UUID) && (RootFolder != null))
            {
-                if (itemInfo.parentFolderID == this.RootFolder.folderID)
+                if (itemInfo.parentFolderID == RootFolder.folderID)
                {
-                    this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);
+                    RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);
                }
                else
                {
-                    InventoryFolderImpl folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);
+                    InventoryFolderImpl folder = RootFolder.HasSubFolder(itemInfo.parentFolderID);
                    if (folder != null)
                    {
-                        folder.Items.Add(itemInfo.inventoryID, itemInfo);                    
+                        folder.Items.Add(itemInfo.inventoryID, itemInfo);
                    }
                }
            }
@@ -90,30 +89,30 @@ namespace OpenSim.Framework.Communications.Cache
        public void AddItem(LLUUID userID, InventoryItemBase itemInfo)
        {
-            if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
+            if ((userID == UserProfile.UUID) && (RootFolder != null))
            {
-                this.ItemReceive(userID, itemInfo);
+                ItemReceive(userID, itemInfo);
-                this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
+                m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
            }
        }
        public void UpdateItem(LLUUID userID, InventoryItemBase itemInfo)
        {
-            if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
+            if ((userID == UserProfile.UUID) && (RootFolder != null))
            {
-                this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
+                m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
            }
        }
        public bool DeleteItem(LLUUID userID, InventoryItemBase item)
        {
            bool result = false;
-            if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
+            if ((userID == UserProfile.UUID) && (RootFolder != null))
            {
                result = RootFolder.DeleteItem(item.inventoryID);
                if (result)
                {
-                    this.m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item);
+                    m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item);
                }
            }
            return result;
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 4904293..74a1ef4 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -25,19 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Threading;
-using System.Reflection;
 using System.Xml.Serialization;
 using libsecondlife;
-using Nini.Config;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -63,7 +57,6 @@ namespace OpenSim.Framework.Communications.Cache
            Stream s = null;
            try
            {
                MainLog.Instance.Debug("ASSETCACHE", "Querying for {0}", assetID.ToString());
                RestClient rc = new RestClient(_assetServerUrl);
@@ -77,8 +70,8 @@ namespace OpenSim.Framework.Communications.Cache
                if (s.Length > 0)
                {
-                    XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
+                    XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
-                    AssetBase asset = (AssetBase)xs.Deserialize(s);
+                    AssetBase asset = (AssetBase) xs.Deserialize(s);
                    _receiver.AssetReceived(asset, isTexture);
                }
@@ -106,7 +99,7 @@ namespace OpenSim.Framework.Communications.Cache
            {
                MemoryStream s = new MemoryStream();
-                XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
+                XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
                xs.Serialize(s, asset);
                RestClient rc = new RestClient(_assetServerUrl);
                rc.AddResourcePath("assets");
@@ -129,7 +122,7 @@ namespace OpenSim.Framework.Communications.Cache
            throw new Exception("The method or operation is not implemented.");
        }
-        public System.Collections.Generic.List<AssetBase> GetDefaultAssets()
+        public List<AssetBase> GetDefaultAssets()
        {
            throw new Exception("The method or operation is not implemented.");
        }
@@ -156,4 +149,4 @@ namespace OpenSim.Framework.Communications.Cache
        #endregion
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
index 0905af8..3495e55 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
@@ -25,14 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -44,17 +38,16 @@ namespace OpenSim.Framework.Communications.Cache
        public InventoryFolderImpl(InventoryFolderBase folderbase)
        {
-            this.agentID = folderbase.agentID;
+            agentID = folderbase.agentID;
-            this.folderID = folderbase.folderID;
+            folderID = folderbase.folderID;
-            this.name = folderbase.name;
+            name = folderbase.name;
-            this.parentID = folderbase.parentID;
+            parentID = folderbase.parentID;
-            this.type = folderbase.type;
+            type = folderbase.type;
-            this.version = folderbase.version;
+            version = folderbase.version;
        }
        public InventoryFolderImpl()
        {
        }
        // Methods
@@ -65,19 +58,19 @@ namespace OpenSim.Framework.Communications.Cache
            subFold.folderID = folderID;
            subFold.type = (short) type;
            subFold.parentID = this.folderID;
-            subFold.agentID = this.agentID;
+            subFold.agentID = agentID;
-            this.SubFolders.Add(subFold.folderID, subFold);
+            SubFolders.Add(subFold.folderID, subFold);
            return subFold;
        }
        public InventoryItemBase HasItem(LLUUID itemID)
        {
            InventoryItemBase base2 = null;
-            if (this.Items.ContainsKey(itemID))
+            if (Items.ContainsKey(itemID))
            {
-                return this.Items[itemID];
+                return Items[itemID];
            }
-            foreach (InventoryFolderImpl folder in this.SubFolders.Values)
+            foreach (InventoryFolderImpl folder in SubFolders.Values)
            {
                base2 = folder.HasItem(itemID);
                if (base2 != null)
@@ -91,12 +84,12 @@ namespace OpenSim.Framework.Communications.Cache
        public bool DeleteItem(LLUUID itemID)
        {
            bool found = false;
-            if (this.Items.ContainsKey(itemID))
+            if (Items.ContainsKey(itemID))
            {
                Items.Remove(itemID);
                return true;
            }
-            foreach (InventoryFolderImpl folder in this.SubFolders.Values)
+            foreach (InventoryFolderImpl folder in SubFolders.Values)
            {
                found = folder.DeleteItem(itemID);
                if (found == true)
@@ -111,13 +104,13 @@ namespace OpenSim.Framework.Communications.Cache
        public InventoryFolderImpl HasSubFolder(LLUUID folderID)
        {
            InventoryFolderImpl returnFolder = null;
-            if (this.SubFolders.ContainsKey(folderID))
+            if (SubFolders.ContainsKey(folderID))
            {
-                returnFolder = this.SubFolders[folderID];
+                returnFolder = SubFolders[folderID];
            }
            else
            {
-                foreach (InventoryFolderImpl folder in this.SubFolders.Values)
+                foreach (InventoryFolderImpl folder in SubFolders.Values)
                {
                    returnFolder = folder.HasSubFolder(folderID);
                    if (returnFolder != null)
@@ -132,7 +125,7 @@ namespace OpenSim.Framework.Communications.Cache
        public List<InventoryItemBase> RequestListOfItems()
        {
            List<InventoryItemBase> itemList = new List<InventoryItemBase>();
-            foreach (InventoryItemBase item in this.Items.Values)
+            foreach (InventoryItemBase item in Items.Values)
            {
                itemList.Add(item);
            }
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 60f9b6b..765c42e 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -26,12 +26,8 @@
 * 
 */
-using System;
 using System.IO;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
-using OpenSim.Framework;
 using Nini.Config;
 namespace OpenSim.Framework.Communications.Cache
@@ -40,43 +36,42 @@ namespace OpenSim.Framework.Communications.Cache
    /// Basically a hack to give us a Inventory library while we don't have a inventory server
    /// once the server is fully implemented then should read the data from that
    /// </summary>
-    public class LibraryRootFolder : Cache.InventoryFolderImpl
+    public class LibraryRootFolder : InventoryFolderImpl
    {
        private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");
-        private Cache.InventoryFolderImpl m_textureFolder;
+        private InventoryFolderImpl m_textureFolder;
        public LibraryRootFolder()
        {
-            this.agentID = libOwner;
+            agentID = libOwner;
-            this.folderID = new LLUUID("00000112-000f-0000-0000-000100bba000");
+            folderID = new LLUUID("00000112-000f-0000-0000-000100bba000");
-            this.name = "OpenSim Library";
+            name = "OpenSim Library";
-            this.parentID = LLUUID.Zero;
+            parentID = LLUUID.Zero;
-            this.type = (short)-1;
+            type = (short) -1;
-            this.version = (ushort)1;
+            version = (ushort) 1;
-            Cache.InventoryFolderImpl folderInfo = new InventoryFolderImpl();
+            InventoryFolderImpl folderInfo = new InventoryFolderImpl();
            folderInfo.agentID = libOwner;
            folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001");
            folderInfo.name = "Texture Library";
-            folderInfo.parentID = this.folderID;
+            folderInfo.parentID = folderID;
            folderInfo.type = -1;
            folderInfo.version = 1;
-            this.SubFolders.Add(folderInfo.folderID, folderInfo);
+            SubFolders.Add(folderInfo.folderID, folderInfo);
-            this.m_textureFolder = folderInfo;
+            m_textureFolder = folderInfo;
-            this.CreateLibraryItems();
+            CreateLibraryItems();
            string filePath = Path.Combine(Util.configDir(), "OpenSimLibrary.xml");
            if (File.Exists(filePath))
            {
                XmlConfigSource source = new XmlConfigSource(filePath);
-                this.ReadItemsFromFile(source);
+                ReadItemsFromFile(source);
            }
        }
        private void CreateLibraryItems()
        {
            InventoryItemBase item = new InventoryItemBase();
            item.avatarID = libOwner;
            item.creatorsID = libOwner;
@@ -90,7 +85,7 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryEveryOnePermissions = 0x7FFFFFFF;
            item.inventoryCurrentPermissions = 0x7FFFFFFF;
            item.inventoryNextPermissions = 0x7FFFFFFF;
-            this.m_textureFolder.Items.Add(item.inventoryID, item);
+            m_textureFolder.Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -105,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryEveryOnePermissions = 0x7FFFFFFF;
            item.inventoryCurrentPermissions = 0x7FFFFFFF;
            item.inventoryNextPermissions = 0x7FFFFFFF;
-            this.m_textureFolder.Items.Add(item.inventoryID, item);
+            m_textureFolder.Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -120,7 +115,7 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryEveryOnePermissions = 0x7FFFFFFF;
            item.inventoryCurrentPermissions = 0x7FFFFFFF;
            item.inventoryNextPermissions = 0x7FFFFFFF;
-            this.m_textureFolder.Items.Add(item.inventoryID, item);
+            m_textureFolder.Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -135,7 +130,7 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryEveryOnePermissions = 0x7FFFFFFF;
            item.inventoryCurrentPermissions = 0x7FFFFFFF;
            item.inventoryNextPermissions = 0x7FFFFFFF;
-            this.m_textureFolder.Items.Add(item.inventoryID, item);
+            m_textureFolder.Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -150,7 +145,7 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryEveryOnePermissions = 0x7FFFFFFF;
            item.inventoryCurrentPermissions = 0x7FFFFFFF;
            item.inventoryNextPermissions = 0x7FFFFFFF;
-            this.m_textureFolder.Items.Add(item.inventoryID, item);
+            m_textureFolder.Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -161,10 +156,10 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryName = "Default Shape";
            item.assetType = 13;
            item.invType = 18;
-            item.parentFolderID = this.folderID;
+            item.parentFolderID = folderID;
            item.inventoryCurrentPermissions = 0;
            item.inventoryNextPermissions = 0;
-            this.Items.Add(item.inventoryID, item);
+            Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -175,10 +170,10 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryName = "Default Skin";
            item.assetType = 13;
            item.invType = 18;
-            item.parentFolderID = this.folderID;
+            item.parentFolderID = folderID;
            item.inventoryCurrentPermissions = 0;
            item.inventoryNextPermissions = 0;
-            this.Items.Add(item.inventoryID, item);
+            Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -189,10 +184,10 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryName = "Default Shirt";
            item.assetType = 5;
            item.invType = 18;
-            item.parentFolderID = this.folderID;
+            item.parentFolderID = folderID;
            item.inventoryCurrentPermissions = 0;
            item.inventoryNextPermissions = 0;
-            this.Items.Add(item.inventoryID, item);
+            Items.Add(item.inventoryID, item);
            item = new InventoryItemBase();
            item.avatarID = libOwner;
@@ -203,11 +198,10 @@ namespace OpenSim.Framework.Communications.Cache
            item.inventoryName = "Default Pants";
            item.assetType = 5;
            item.invType = 18;
-            item.parentFolderID = this.folderID;
+            item.parentFolderID = folderID;
            item.inventoryCurrentPermissions = 0;
            item.inventoryNextPermissions = 0;
-            this.Items.Add(item.inventoryID, item);
+            Items.Add(item.inventoryID, item);
        }
        private void ReadItemsFromFile(IConfigSource source)
@@ -217,28 +211,28 @@ namespace OpenSim.Framework.Communications.Cache
                InventoryItemBase item = new InventoryItemBase();
                item.avatarID = libOwner;
                item.creatorsID = libOwner;
-                item.inventoryID = new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToStringHyphenated()));
+                item.inventoryID =
+                    new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToStringHyphenated()));
                item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()));
                item.inventoryDescription = source.Configs[i].GetString("description", "");
                item.inventoryName = source.Configs[i].GetString("name", "");
                item.assetType = source.Configs[i].GetInt("assetType", 0);
                item.invType = source.Configs[i].GetInt("inventoryType", 0);
-                item.inventoryCurrentPermissions = (uint)source.Configs[i].GetLong("currentPermissions", 0x7FFFFFFF);
+                item.inventoryCurrentPermissions = (uint) source.Configs[i].GetLong("currentPermissions", 0x7FFFFFFF);
-                item.inventoryNextPermissions = (uint)source.Configs[i].GetLong("nextPermissions", 0x7FFFFFFF);
+                item.inventoryNextPermissions = (uint) source.Configs[i].GetLong("nextPermissions", 0x7FFFFFFF);
-                item.inventoryEveryOnePermissions = (uint)source.Configs[i].GetLong("everyonePermissions", 0x7FFFFFFF);
+                item.inventoryEveryOnePermissions = (uint) source.Configs[i].GetLong("everyonePermissions", 0x7FFFFFFF);
-                item.inventoryBasePermissions = (uint)source.Configs[i].GetLong("basePermissions", 0x7FFFFFFF);
+                item.inventoryBasePermissions = (uint) source.Configs[i].GetLong("basePermissions", 0x7FFFFFFF);
                if (item.assetType == 0)
                {
-                    item.parentFolderID = this.m_textureFolder.folderID;
+                    item.parentFolderID = m_textureFolder.folderID;
-                    this.m_textureFolder.Items.Add(item.inventoryID, item);
+                    m_textureFolder.Items.Add(item.inventoryID, item);
                }
                else
                {
-                    item.parentFolderID = this.folderID;
+                    item.parentFolderID = folderID;
-                    this.Items.Add(item.inventoryID, item);
+                    Items.Add(item.inventoryID, item);
                }
            }
        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 0953e19..b4f29db 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -26,14 +26,8 @@
 * 
 */
 using System;
-using System.IO;
-using System.Threading;
 using System.Reflection;
-using libsecondlife;
-using Nini.Config;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -62,11 +56,14 @@ namespace OpenSim.Framework.Communications.Cache
                    if (typeInterface != null)
                    {
-                        IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        IAssetProvider plug =
+                            (IAssetProvider) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                        m_assetProviderPlugin = plug;
                        m_assetProviderPlugin.Initialise();
-                        MainLog.Instance.Verbose("AssetStorage","Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
+                        MainLog.Instance.Verbose("AssetStorage",
+                                                 "Added " + m_assetProviderPlugin.Name + " " +
+                                                 m_assetProviderPlugin.Version);
                    }
                    typeInterface = null;
@@ -84,13 +81,13 @@ namespace OpenSim.Framework.Communications.Cache
            m_assetProviderPlugin.CommitAssets();
        }
-        override protected void RunRequests()
+        protected override void RunRequests()
        {
            while (true)
            {
-                ARequest req = this._assetRequests.Dequeue();
+                ARequest req = _assetRequests.Dequeue();
-               //MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID);
+                //MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID);
                AssetBase asset = null;
                lock (syncLock)
@@ -105,9 +102,7 @@ namespace OpenSim.Framework.Communications.Cache
                {
                    _receiver.AssetNotFound(req.AssetID);
                }
            }
        }
        protected override void StoreAsset(AssetBase asset)
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 8105556..fe943b0 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -25,16 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -49,7 +41,7 @@ namespace OpenSim.Framework.Communications.Cache
        // Methods
        public UserProfileCache(CommunicationsManager parent)
        {
-            this.m_parent = parent;
+            m_parent = parent;
        }
        /// <summary>
@@ -62,14 +54,14 @@ namespace OpenSim.Framework.Communications.Cache
            // Potential fix - Multithreading issue.
            lock (UserProfiles)
            {
-                if (!this.UserProfiles.ContainsKey(userID))
+                if (!UserProfiles.ContainsKey(userID))
                {
-                    CachedUserInfo userInfo = new CachedUserInfo(this.m_parent);
+                    CachedUserInfo userInfo = new CachedUserInfo(m_parent);
-                    userInfo.UserProfile = this.RequestUserProfileForUser(userID);
+                    userInfo.UserProfile = RequestUserProfileForUser(userID);
                    if (userInfo.UserProfile != null)
                    {
-                        this.RequestInventoryForUser(userID, userInfo);
+                        RequestInventoryForUser(userID, userInfo);
-                        this.UserProfiles.Add(userID, userInfo);
+                        UserProfiles.Add(userID, userInfo);
                    }
                    else
                    {
@@ -91,26 +83,28 @@ namespace OpenSim.Framework.Communications.Cache
        public CachedUserInfo GetUserDetails(LLUUID userID)
        {
-            if (this.UserProfiles.ContainsKey(userID))
+            if (UserProfiles.ContainsKey(userID))
            {
-                return this.UserProfiles[userID];
+                return UserProfiles[userID];
            }
            return null;
        }
-        public void HandleCreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID)
+        public void HandleCreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType,
+                                                string folderName, LLUUID parentID)
        {
-            if (this.UserProfiles.ContainsKey(remoteClient.AgentId))
+            if (UserProfiles.ContainsKey(remoteClient.AgentId))
            {
-                if (this.UserProfiles[remoteClient.AgentId].RootFolder != null)
+                if (UserProfiles[remoteClient.AgentId].RootFolder != null)
                {
-                    CachedUserInfo info = this.UserProfiles[remoteClient.AgentId];
+                    CachedUserInfo info = UserProfiles[remoteClient.AgentId];
                    if (info.RootFolder.folderID == parentID)
                    {
-                        InventoryFolderImpl createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
+                        InventoryFolderImpl createdFolder =
+                            info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
                        if (createdFolder != null)
                        {
-                            this.m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
+                            m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
                        }
                    }
                    else
@@ -125,27 +119,30 @@ namespace OpenSim.Framework.Communications.Cache
            }
        }
-        public void HandleFecthInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder)
+        public void HandleFecthInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID,
+                                                    bool fetchFolders, bool fetchItems, int sortOrder)
        {
-            InventoryFolderImpl fold  = null;
+            InventoryFolderImpl fold = null;
-            if (folderID == libraryRoot.folderID )
+            if (folderID == libraryRoot.folderID)
            {
-                remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, libraryRoot.folderID, libraryRoot.RequestListOfItems());
+                remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, libraryRoot.folderID,
+                                                        libraryRoot.RequestListOfItems());
            }
-            else if (( fold = libraryRoot.HasSubFolder(folderID)) != null)
+            else if ((fold = libraryRoot.HasSubFolder(folderID)) != null)
            {
                remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems());
            }
-            else if (this.UserProfiles.ContainsKey(remoteClient.AgentId))
+            else if (UserProfiles.ContainsKey(remoteClient.AgentId))
            {
-                if (this.UserProfiles[remoteClient.AgentId].RootFolder != null)
+                if (UserProfiles[remoteClient.AgentId].RootFolder != null)
                {
-                    CachedUserInfo info = this.UserProfiles[remoteClient.AgentId];
+                    CachedUserInfo info = UserProfiles[remoteClient.AgentId];
                    if (info.RootFolder.folderID == folderID)
                    {
                        if (fetchItems)
                        {
-                            remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID, info.RootFolder.RequestListOfItems());
+                            remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID,
+                                                                    info.RootFolder.RequestListOfItems());
                        }
                    }
                    else
@@ -153,7 +150,8 @@ namespace OpenSim.Framework.Communications.Cache
                        InventoryFolderImpl folder = info.RootFolder.HasSubFolder(folderID);
                        if ((folder != null) && fetchItems)
                        {
-                            remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID, folder.RequestListOfItems());
+                            remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID,
+                                                                    folder.RequestListOfItems());
                        }
                    }
                }
@@ -166,11 +164,11 @@ namespace OpenSim.Framework.Communications.Cache
            {
                //Console.WriteLine("request info for library item");
            }
-            else if (this.UserProfiles.ContainsKey(remoteClient.AgentId))
+            else if (UserProfiles.ContainsKey(remoteClient.AgentId))
            {
-                if (this.UserProfiles[remoteClient.AgentId].RootFolder != null)
+                if (UserProfiles[remoteClient.AgentId].RootFolder != null)
                {
-                    InventoryItemBase item = this.UserProfiles[remoteClient.AgentId].RootFolder.HasItem(itemID);
+                    InventoryItemBase item = UserProfiles[remoteClient.AgentId].RootFolder.HasItem(itemID);
                    if (item != null)
                    {
                        remoteClient.SendInventoryItemDetails(ownerID, item);
@@ -185,7 +183,7 @@ namespace OpenSim.Framework.Communications.Cache
        /// <param name="userID"></param>
        private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
        {
-            this.m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
+            m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
        }
        /// <summary>
@@ -194,7 +192,7 @@ namespace OpenSim.Framework.Communications.Cache
        /// <param name="userID"></param>
        private UserProfileData RequestUserProfileForUser(LLUUID userID)
        {
-            return this.m_parent.UserService.GetUserProfile(userID);
+            return m_parent.UserService.GetUserProfile(userID);
        }
        /// <summary>
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a114b64..23dfcc6 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -28,18 +28,23 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework;
 namespace OpenSim.Region.Capabilities
 {
-    public delegate void UpLoadedAsset(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, byte[] data, string inventoryType, string assetType);
+    public delegate void UpLoadedAsset(
+        string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, byte[] data,
+        string inventoryType, string assetType);
    public delegate LLUUID UpdateItem(LLUUID itemID, byte[] data);
    public delegate void NewInventoryItem(LLUUID userID, InventoryItemBase item);
    public delegate LLUUID ItemUpdatedCallback(LLUUID userID, LLUUID itemID, byte[] data);
    public class Caps
@@ -62,7 +67,8 @@ namespace OpenSim.Region.Capabilities
        public ItemUpdatedCallback ItemUpdatedCall = null;
        private bool m_dumpAssetsToFile;
-        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, int httpPort, string capsPath, LLUUID agent, bool dumpAssetsToFile)
+        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, int httpPort, string capsPath,
+                    LLUUID agent, bool dumpAssetsToFile)
        {
            assetCache = assetCach;
            m_capsObjectPath = capsPath;
@@ -78,12 +84,17 @@ namespace OpenSim.Region.Capabilities
        /// </summary>
        public void RegisterHandlers()
        {
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("CAPS","Registering CAPS handlers");
+            MainLog.Instance.Verbose("CAPS", "Registering CAPS handlers");
            string capsBase = "/CAPS/" + m_capsObjectPath;
            try
            {
-                httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer));
+                httpListener.AddStreamHandler(
-                httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
+                    new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath,
+                                                                                GetMapLayer));
+                httpListener.AddStreamHandler(
+                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",
+                                                                                           capsBase + m_newInventory,
+                                                                                           NewAgentInventoryRequest));
                AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
                //AddLegacyCapsHandler(httpListener, m_requestTexture , RequestTexture);
@@ -103,7 +114,7 @@ namespace OpenSim.Region.Capabilities
            string capsBase = "/CAPS/" + m_capsObjectPath;
            httpListener.AddStreamHandler(new RestStreamHandler("POST", capsBase + path, restMethod));
        }
-       
        /// <summary>
        /// 
        /// </summary>
@@ -113,8 +124,8 @@ namespace OpenSim.Region.Capabilities
        /// <returns></returns>
        public string CapsRequest(string request, string path, string param)
        {
-           // Console.WriteLine("caps request " + request);
+            // Console.WriteLine("caps request " + request);
-            string result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+            string result = LLSDHelpers.SerialiseLLSDReply(GetCapabilities());
            return result;
        }
@@ -125,9 +136,10 @@ namespace OpenSim.Region.Capabilities
        protected LLSDCapsDetails GetCapabilities()
        {
            LLSDCapsDetails caps = new LLSDCapsDetails();
-            string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath;
+            string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" +
+                                 m_capsObjectPath;
            caps.MapLayer = capsBaseUrl + m_mapLayerPath;
-           // caps.RequestTextureDownload = capsBaseUrl + m_requestTexture;
+            // caps.RequestTextureDownload = capsBaseUrl + m_requestTexture;
            caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;
            caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath;
            caps.UpdateScriptAgentInventory = capsBaseUrl + m_notecardUpdatePath;
@@ -142,7 +154,7 @@ namespace OpenSim.Region.Capabilities
        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
        {
            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
-            mapResponse.LayerData.Array.Add(this.GetLLSDMapLayerResponse());
+            mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse());
            return mapResponse;
        }
@@ -174,6 +186,7 @@ namespace OpenSim.Region.Capabilities
        }
        #region EventQueue (Currently not enabled)
        /// <summary>
        /// 
        /// </summary>
@@ -184,10 +197,10 @@ namespace OpenSim.Region.Capabilities
        public string ProcessEventQueue(string request, string path, string param)
        {
            string res = "";
-            
-            if (this.CapsEventQueue.Count > 0)
+            if (CapsEventQueue.Count > 0)
            {
-                lock (this.CapsEventQueue)
+                lock (CapsEventQueue)
                {
                    string item = CapsEventQueue.Dequeue();
                    res = item;
@@ -195,7 +208,7 @@ namespace OpenSim.Region.Capabilities
            }
            else
            {
-                res = this.CreateEmptyEventResponse();
+                res = CreateEmptyEventResponse();
            }
            return res;
        }
@@ -214,8 +227,8 @@ namespace OpenSim.Region.Capabilities
            eventItem.events.Array.Add(new LLSDEmpty());
            string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
            eventQueueCount++;
-            
-            this.CapsEventQueue.Enqueue(res);
+            CapsEventQueue.Enqueue(res);
            return res;
        }
@@ -232,6 +245,7 @@ namespace OpenSim.Region.Capabilities
            eventQueueCount++;
            return res;
        }
        #endregion
        /// <summary>
@@ -243,24 +257,27 @@ namespace OpenSim.Region.Capabilities
        /// <returns></returns>
        public string NoteCardAgentInventory(string request, string path, string param)
        {
-            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Helpers.StringToField(request));
+            Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request));
            LLSDItemUpdate llsdRequest = new LLSDItemUpdate();
            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
-          
            string capsBase = "/CAPS/" + m_capsObjectPath;
            LLUUID newInvItem = llsdRequest.item_id;
            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
-            ItemUpdater uploader = new ItemUpdater(newInvItem, capsBase + uploaderPath, this.httpListener, m_dumpAssetsToFile );
+            ItemUpdater uploader =
-            uploader.OnUpLoad += this.ItemUpdated;
+                new ItemUpdater(newInvItem, capsBase + uploaderPath, httpListener, m_dumpAssetsToFile);
+            uploader.OnUpLoad += ItemUpdated;
-            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+            httpListener.AddStreamHandler(
-            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
+                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +
+                                 uploaderPath;
            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
            uploadResponse.uploader = uploaderURL;
            uploadResponse.state = "upload";
-            
            return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
        }
@@ -272,7 +289,7 @@ namespace OpenSim.Region.Capabilities
        public LLSDAssetUploadResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest)
        {
            //Console.WriteLine("asset upload request via CAPS" + llsdRequest.inventory_type +" , "+ llsdRequest.asset_type);
-            
            string assetName = llsdRequest.name;
            string assetDes = llsdRequest.description;
            string capsBase = "/CAPS/" + m_capsObjectPath;
@@ -281,14 +298,18 @@ namespace OpenSim.Region.Capabilities
            LLUUID parentFolder = llsdRequest.folder_id;
            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
-            AssetUploader uploader = new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, llsdRequest.asset_type, capsBase + uploaderPath, this.httpListener, m_dumpAssetsToFile);
+            AssetUploader uploader =
-            httpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
-            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase + uploaderPath;
+                                  llsdRequest.asset_type, capsBase + uploaderPath, httpListener, m_dumpAssetsToFile);
+            httpListener.AddStreamHandler(
+                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+            string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + capsBase +
+                                 uploaderPath;
            LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
            uploadResponse.uploader = uploaderURL;
            uploadResponse.state = "upload";
-            uploader.OnUpLoad += this.UploadCompleteHandler;
+            uploader.OnUpLoad += UploadCompleteHandler;
            return uploadResponse;
        }
@@ -298,7 +319,9 @@ namespace OpenSim.Region.Capabilities
        /// <param name="assetID"></param>
        /// <param name="inventoryItem"></param>
        /// <param name="data"></param>
-        public void UploadCompleteHandler(string assetName, string assetDescription, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder,  byte[] data, string inventoryType, string assetType)
+        public void UploadCompleteHandler(string assetName, string assetDescription, LLUUID assetID,
+                                          LLUUID inventoryItem, LLUUID parentFolder, byte[] data, string inventoryType,
+                                          string assetType)
        {
            sbyte assType = 0;
            sbyte inType = 0;
@@ -319,14 +342,14 @@ namespace OpenSim.Region.Capabilities
            asset.FullID = assetID;
            asset.Type = assType;
            asset.InvType = inType;
-            asset.Name = assetName; 
+            asset.Name = assetName;
            asset.Data = data;
-            this.assetCache.AddAsset(asset);
+            assetCache.AddAsset(asset);
            InventoryItemBase item = new InventoryItemBase();
            item.avatarID = agentID;
            item.creatorsID = agentID;
-            item.inventoryID =  inventoryItem;
+            item.inventoryID = inventoryItem;
            item.assetID = asset.FullID;
            item.inventoryDescription = assetDescription;
            item.inventoryName = assetName;
@@ -340,14 +363,13 @@ namespace OpenSim.Region.Capabilities
            {
                AddNewInventoryItem(agentID, item);
            }
        }
        public LLUUID ItemUpdated(LLUUID itemID, byte[] data)
        {
            if (ItemUpdatedCall != null)
            {
-               return ItemUpdatedCall(this.agentID, itemID, data);
+                return ItemUpdatedCall(agentID, itemID, data);
            }
            return LLUUID.Zero;
        }
@@ -359,7 +381,7 @@ namespace OpenSim.Region.Capabilities
            private string uploaderPath = "";
            private LLUUID newAssetID;
            private LLUUID inventoryItemID;
-            private LLUUID parentFolder; 
+            private LLUUID parentFolder;
            private BaseHttpServer httpListener;
            private bool m_dumpAssetsToFile;
            private string m_assetName = "";
@@ -368,7 +390,9 @@ namespace OpenSim.Region.Capabilities
            private string m_invType = "";
            private string m_assetType = "";
-            public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolderID, string invType, string assetType, string path, BaseHttpServer httpServer, bool dumpAssetsToFile)
+            public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem,
+                                 LLUUID parentFolderID, string invType, string assetType, string path,
+                                 BaseHttpServer httpServer, bool dumpAssetsToFile)
            {
                m_assetName = assetName;
                m_assetDes = description;
@@ -391,7 +415,7 @@ namespace OpenSim.Region.Capabilities
            /// <returns></returns>
            public string uploaderCaps(byte[] data, string path, string param)
            {
-                LLUUID inv = this.inventoryItemID;
+                LLUUID inv = inventoryItemID;
                string res = "";
                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
                uploadComplete.new_asset = newAssetID.ToStringHyphenated();
@@ -399,29 +423,29 @@ namespace OpenSim.Region.Capabilities
                uploadComplete.state = "complete";
                res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
-             
                httpListener.RemoveStreamHandler("POST", uploaderPath);
-                if (this.m_dumpAssetsToFile)
+                if (m_dumpAssetsToFile)
                {
-                    this.SaveAssetToFile(m_assetName + ".jp2", data);
+                    SaveAssetToFile(m_assetName + ".jp2", data);
                }
                if (OnUpLoad != null)
                {
                    OnUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
                }
-                
                return res;
            }
            private void SaveAssetToFile(string filename, byte[] data)
            {
-               FileStream fs = File.Create(filename);
+                FileStream fs = File.Create(filename);
-               BinaryWriter bw = new BinaryWriter(fs);
+                BinaryWriter bw = new BinaryWriter(fs);
-               bw.Write(data);
+                bw.Write(data);
-               bw.Close();
+                bw.Close();
-               fs.Close();
+                fs.Close();
            }
        }
@@ -434,7 +458,7 @@ namespace OpenSim.Region.Capabilities
            private BaseHttpServer httpListener;
            private bool m_dumpAssetToFile;
-            public ItemUpdater( LLUUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile)
+            public ItemUpdater(LLUUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile)
            {
                m_dumpAssetToFile = dumpAssetToFile;
@@ -452,7 +476,7 @@ namespace OpenSim.Region.Capabilities
            /// <returns></returns>
            public string uploaderCaps(byte[] data, string path, string param)
            {
-                LLUUID inv = this.inventoryItemID;
+                LLUUID inv = inventoryItemID;
                string res = "";
                LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
                LLUUID assetID = LLUUID.Zero;
@@ -461,7 +485,7 @@ namespace OpenSim.Region.Capabilities
                {
                    assetID = OnUpLoad(inv, data);
                }
-               
                uploadComplete.new_asset = assetID.ToStringHyphenated();
                uploadComplete.new_inventory_item = inv;
                uploadComplete.state = "complete";
@@ -470,9 +494,9 @@ namespace OpenSim.Region.Capabilities
                httpListener.RemoveStreamHandler("POST", uploaderPath);
-                if (this.m_dumpAssetToFile)
+                if (m_dumpAssetToFile)
                {
-                    this.SaveAssetToFile("updateditem" + Util.RandomClass.Next(1, 1000) + ".dat", data);
+                    SaveAssetToFile("updateditem" + Util.RandomClass.Next(1, 1000) + ".dat", data);
                }
                return res;
@@ -488,6 +512,4 @@ namespace OpenSim.Region.Capabilities
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
index 2af5a4a..2ed7750 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDArray()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index e65e741..d054386 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -39,7 +39,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDAssetUploadComplete()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 3a2fe20..7fed27a 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -26,9 +26,6 @@
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 namespace OpenSim.Region.Capabilities
@@ -46,4 +43,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index c7a9ee6..3ad618d 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -26,10 +26,6 @@
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 namespace OpenSim.Region.Capabilities
 {
    [LLSDMap]
@@ -40,7 +36,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDAssetUploadResponse()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
index d1894d4..06afac4 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDCapEvent()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
index 3184792..35caa15 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
@@ -34,18 +34,14 @@ namespace OpenSim.Region.Capabilities
        public string MapLayer = "";
        public string NewFileAgentInventory = "";
        //public string EventQueueGet = "";
-       // public string RequestTextureDownload = "";
+        // public string RequestTextureDownload = "";
-       // public string ChatSessionRequest = "";
+        // public string ChatSessionRequest = "";
        public string UpdateNotecardAgentInventory = "";
        public string UpdateScriptAgentInventory = "";
-       // public string ParcelVoiceInfoRequest = "";
+        // public string ParcelVoiceInfoRequest = "";
        public LLSDCapsDetails()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
index 0169d3c..69c525c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDEmpty.cs
@@ -32,7 +32,6 @@ namespace OpenSim.Region.Capabilities
    {
        public LLSDEmpty()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index 8a2215f..8252a63 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Capabilities
        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
        {
            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false);
            if (llsdattributes.Length > 0)
            {
                switch (llsdattributes[0].ObjectType)
@@ -62,7 +62,8 @@ namespace OpenSim.Region.Capabilities
                        for (int i = 0; i < fields.Length; i++)
                        {
                            object fieldValue = fields[i].GetValue(obj);
-                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
+                            LLSDType[] fieldAttributes =
+                                (LLSDType[]) fieldValue.GetType().GetCustomAttributes(typeof (LLSDType), false);
                            if (fieldAttributes.Length > 0)
                            {
                                writer.WriteStartElement(String.Empty, "key", String.Empty);
@@ -83,7 +84,7 @@ namespace OpenSim.Region.Capabilities
                    case "ARRAY":
                        // LLSDArray arrayObject = obj as LLSDArray;
                        // ArrayList a = arrayObject.Array;
-                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
+                        ArrayList a = (ArrayList) obj.GetType().GetField("Array").GetValue(obj);
                        if (a != null)
                        {
                            writer.WriteStartElement(String.Empty, "array", String.Empty);
@@ -105,7 +106,7 @@ namespace OpenSim.Region.Capabilities
        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
        {
            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false);
            if (llsdattributes.Length > 0)
            {
                switch (llsdattributes[0].ObjectType)
@@ -114,7 +115,7 @@ namespace OpenSim.Region.Capabilities
                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
                        while (enumerator.MoveNext())
                        {
-                            FieldInfo field = myType.GetField((string)enumerator.Key);
+                            FieldInfo field = myType.GetField((string) enumerator.Key);
                            if (field != null)
                            {
                                if (enumerator.Value is Hashtable)
@@ -142,23 +143,4 @@ namespace OpenSim.Region.Capabilities
            return obj;
        }
    }
+}
+\ No newline at end of file
-    
-    
-   
-    
-    
-    
-    
-    
-    
-}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index 57fc9e8..3842058 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -26,9 +26,6 @@
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 namespace OpenSim.Region.Capabilities
@@ -42,4 +39,4 @@ namespace OpenSim.Region.Capabilities
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index 6d17bff..683e479 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
@@ -40,7 +40,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDMapLayer()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
index 7900290..1945a6c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDMapLayerResponse()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
index 5fa08c9..935f81d 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDMapRequest()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
index 67253ee..6bd47e1 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
@@ -26,11 +26,7 @@
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 namespace OpenSim.Region.Capabilities
 {
    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 894b276..08e9563 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -26,13 +26,11 @@
 * 
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Servers;
-using System.IO;
 using System.Collections;
+using System.IO;
+using System.Text;
 using libsecondlife;
+using OpenSim.Framework.Servers;
 namespace OpenSim.Region.Capabilities
 {
@@ -42,11 +40,11 @@ namespace OpenSim.Region.Capabilities
        private LLSDMethod<TRequest, TResponse> m_method;
        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : base(httpMethod, path )
+            : base(httpMethod, path)
        {
            m_method = method;
        }
-        
        public override byte[] Handle(string path, Stream request)
        {
            //Encoding encoding = Encoding.UTF8;
@@ -55,16 +53,15 @@ namespace OpenSim.Region.Capabilities
            //string requestBody = streamReader.ReadToEnd();
            //streamReader.Close();
-            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize( request );
+            Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
            TRequest llsdRequest = new TRequest();
            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
            TResponse response = m_method(llsdRequest);
            Encoding encoding = new UTF8Encoding(false);
-            
-            return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );
+            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
index f70fa11..c2a6054 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTest.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Region.Capabilities
        public LLSDTest()
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
index 6af7f39..a90ae03 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
@@ -37,23 +37,19 @@ namespace OpenSim.Region.Capabilities
        public LLSDType(string type)
        {
            myType = type;
        }
        public string ObjectType
        {
-            get
+            get { return myType; }
-            {
-                return myType;
-            }
        }
    }
    [AttributeUsage(AttributeTargets.Class)]
    public class LLSDMap : LLSDType
    {
-        public LLSDMap() : base( "MAP" )
+        public LLSDMap() : base("MAP")
        {
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index d8d198b..77c7261 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -28,69 +28,77 @@
 using System;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
 namespace OpenSim.Framework.Communications
 {
    public class CommunicationsManager
    {
        protected IUserService m_userService;
        public IUserService UserService
        {
            get { return m_userService; }
        }
        protected IGridServices m_gridService;
        public IGridServices GridService
        {
            get { return m_gridService; }
        }
        protected IInventoryServices m_inventoryService;
        public IInventoryServices InventoryService
        {
            get { return m_inventoryService; }
        }
        protected IInterRegionCommunications m_interRegion;
        public IInterRegionCommunications InterRegion
        {
            get { return m_interRegion; }
        }
        protected UserProfileCache m_userProfileCache;
        public UserProfileCache UserProfileCache
        {
            get { return m_userProfileCache; }
        }
        protected AssetTransactionManager m_transactionsManager;
        public AssetTransactionManager TransactionsManager
        {
            get { return m_transactionsManager; }
        }
        protected AssetCache m_assetCache;
        public AssetCache AssetCache
        {
            get { return m_assetCache; }
        }
        protected NetworkServersInfo m_networkServersInfo;
        public NetworkServersInfo NetworkServersInfo
        {
            get { return m_networkServersInfo; }
        }
-        public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool dumpAssetsToFile)
+        public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache,
+                                     bool dumpAssetsToFile)
        {
            m_networkServersInfo = serversInfo;
            m_assetCache = assetCache;
            m_userProfileCache = new UserProfileCache(this);
-            m_transactionsManager = new AssetTransactionManager(this, dumpAssetsToFile );
+            m_transactionsManager = new AssetTransactionManager(this, dumpAssetsToFile);
        }
        public void doCreate(string[] cmmdParams)
@@ -106,7 +114,6 @@ namespace OpenSim.Framework.Communications
                    if (cmmdParams.Length < 2)
                    {
                        firstName = MainLog.Instance.CmdPrompt("First name", "Default");
                        lastName = MainLog.Instance.CmdPrompt("Last name", "User");
                        password = MainLog.Instance.PasswdPrompt("Password");
@@ -120,7 +127,6 @@ namespace OpenSim.Framework.Communications
                        password = cmmdParams[3];
                        regX = Convert.ToUInt32(cmmdParams[4]);
                        regY = Convert.ToUInt32(cmmdParams[5]);
                    }
                    AddUser(firstName, lastName, password, regX, regY);
@@ -140,7 +146,7 @@ namespace OpenSim.Framework.Communications
            }
            else
            {
-                this.m_inventoryService.CreateNewUserInventory(userProf.UUID);
+                m_inventoryService.CreateNewUserInventory(userProf.UUID);
                System.Console.WriteLine("Created new inventory set for " + firstName + " " + lastName);
                return userProf.UUID;
            }
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index ccbb729..ce6205f 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -27,10 +27,6 @@
 */
 using System.Collections.Generic;
-using System.Net;
-using libsecondlife;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications
 {
@@ -41,4 +37,4 @@ namespace OpenSim.Framework.Communications
        RegionInfo RequestNeighbourInfo(ulong regionHandle);
        List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 244747d..d4fb54b 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -26,7 +26,6 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications
 {
@@ -36,4 +35,4 @@ namespace OpenSim.Framework.Communications
        bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);
        bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId);
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index e7758c4..fc301c2 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -26,16 +26,14 @@
 * 
 */
-using System;
 using System.Collections.Generic;
-using System.Text;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications
 {
    public delegate void InventoryFolderInfo(LLUUID userID, InventoryFolderImpl folderInfo);
    public delegate void InventoryItemInfo(LLUUID userID, InventoryItemBase itemInfo);
    public interface IInventoryServices
@@ -53,4 +51,4 @@ namespace OpenSim.Framework.Communications
        /// <returns></returns>
        List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 05183be..effe132 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -30,10 +30,8 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using libsecondlife;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
-using OpenSim.Framework;
 namespace OpenSim.Framework.Communications
 {
@@ -67,10 +65,10 @@ namespace OpenSim.Framework.Communications
                        if (typeInterface != null)
                        {
                            IInventoryData plug =
-                                (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                                (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                            plug.Initialise();
-                            this.m_plugins.Add(plug.getName(), plug);
+                            m_plugins.Add(plug.getName(), plug);
-                            MainLog.Instance.Verbose("INVENTORY","Added IInventoryData Interface");
+                            MainLog.Instance.Verbose("INVENTORY", "Added IInventoryData Interface");
                        }
                    }
                }
@@ -168,7 +166,7 @@ namespace OpenSim.Framework.Communications
        {
            foreach (InventoryFolderBase folder in inventory.Folders.Values)
            {
-                this.AddFolder(folder);
+                AddFolder(folder);
            }
        }
@@ -176,7 +174,7 @@ namespace OpenSim.Framework.Communications
        {
            UsersInventory inven = new UsersInventory();
            inven.CreateNewInventorySet(user);
-            this.AddNewInventorySet(inven);
+            AddNewInventorySet(inven);
        }
        public class UsersInventory
@@ -186,7 +184,6 @@ namespace OpenSim.Framework.Communications
            public UsersInventory()
            {
            }
            public virtual void CreateNewInventorySet(LLUUID user)
@@ -231,9 +228,11 @@ namespace OpenSim.Framework.Communications
            }
        }
-        public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack);
+        public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
+                                                     InventoryItemInfo itemCallBack);
        public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder);
        public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
        public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 38bc016..4d1c35a 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -34,12 +34,10 @@ using OpenSim.Framework.Console;
 namespace OpenSim.Framework.UserManagement
 {
    /// <summary>
    /// A temp class to handle login response.
    /// Should make use of UserProfileManager where possible.
    /// </summary>
    public class LoginResponse
    {
        private Hashtable loginFlagsHash;
@@ -103,211 +101,222 @@ namespace OpenSim.Framework.UserManagement
        public LoginResponse()
        {
-            this.loginFlags = new ArrayList();
+            loginFlags = new ArrayList();
-            this.globalTextures = new ArrayList();
+            globalTextures = new ArrayList();
-            this.eventCategories = new ArrayList();
+            eventCategories = new ArrayList();
-            this.uiConfig = new ArrayList();
+            uiConfig = new ArrayList();
-            this.classifiedCategories = new ArrayList();
+            classifiedCategories = new ArrayList();
-            this.loginError = new Hashtable();
+            loginError = new Hashtable();
-            this.uiConfigHash = new Hashtable();
+            uiConfigHash = new Hashtable();
-            this.defaultXmlRpcResponse = new XmlRpcResponse();
+            defaultXmlRpcResponse = new XmlRpcResponse();
-            this.userProfile = new UserInfo();
+            userProfile = new UserInfo();
-            this.inventoryRoot = new ArrayList();
+            inventoryRoot = new ArrayList();
-            this.initialOutfit = new ArrayList();
+            initialOutfit = new ArrayList();
-            this.agentInventory = new ArrayList();
+            agentInventory = new ArrayList();
-            this.inventoryLibrary = new ArrayList();
+            inventoryLibrary = new ArrayList();
-            this.inventoryLibraryOwner = new ArrayList();
+            inventoryLibraryOwner = new ArrayList();
-            this.xmlRpcResponse = new XmlRpcResponse();
+            xmlRpcResponse = new XmlRpcResponse();
-            this.defaultXmlRpcResponse = new XmlRpcResponse();
+            defaultXmlRpcResponse = new XmlRpcResponse();
-            this.SetDefaultValues();
+            SetDefaultValues();
        } // LoginServer
        public void SetDefaultValues()
        {
-                this.DST = "N";
+            DST = "N";
-                this.StipendSinceLogin = "N";
+            StipendSinceLogin = "N";
-                this.Gendered = "Y";
+            Gendered = "Y";
-                this.EverLoggedIn = "Y";
+            EverLoggedIn = "Y";
-                this.login = "false";
+            login = "false";
-                this.firstname = "Test";
+            firstname = "Test";
-                this.lastname = "User";
+            lastname = "User";
-                this.agentAccess = "M";
+            agentAccess = "M";
-                this.startLocation = "last";
+            startLocation = "last";
-                this.allowFirstLife = "Y";
+            allowFirstLife = "Y";
-                this.SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";
+            SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";
-                this.CloudTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
+            CloudTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                this.MoonTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
+            MoonTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                this.ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";
+            ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";
-                this.ErrorReason = "key";
+            ErrorReason = "key";
-                this.welcomeMessage = "Welcome to OpenSim!";
+            welcomeMessage = "Welcome to OpenSim!";
-                this.seedCapability = "";
+            seedCapability = "";
-                this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
+            home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" +
-                this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
+                   userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
-                this.RegionX = (uint)255232;
+                   userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +
-                this.RegionY = (uint)254976;
+                   userProfile.homelookat.Y.ToString() + ",r" + userProfile.homelookat.Z.ToString() + "]}";
+            lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
-                // Classifieds;
+            RegionX = (uint) 255232;
-                this.AddClassifiedCategory((Int32)1, "Shopping");
+            RegionY = (uint) 254976;
-                this.AddClassifiedCategory((Int32)2, "Land Rental");
-                this.AddClassifiedCategory((Int32)3, "Property Rental");
+            // Classifieds;
-                this.AddClassifiedCategory((Int32)4, "Special Attraction");
+            AddClassifiedCategory((Int32) 1, "Shopping");
-                this.AddClassifiedCategory((Int32)5, "New Products");
+            AddClassifiedCategory((Int32) 2, "Land Rental");
-                this.AddClassifiedCategory((Int32)6, "Employment");
+            AddClassifiedCategory((Int32) 3, "Property Rental");
-                this.AddClassifiedCategory((Int32)7, "Wanted");
+            AddClassifiedCategory((Int32) 4, "Special Attraction");
-                this.AddClassifiedCategory((Int32)8, "Service");
+            AddClassifiedCategory((Int32) 5, "New Products");
-                this.AddClassifiedCategory((Int32)9, "Personal");
+            AddClassifiedCategory((Int32) 6, "Employment");
-                
+            AddClassifiedCategory((Int32) 7, "Wanted");
+            AddClassifiedCategory((Int32) 8, "Service");
-                this.SessionID = LLUUID.Random();
+            AddClassifiedCategory((Int32) 9, "Personal");
-                this.SecureSessionID = LLUUID.Random();
-                this.AgentID = LLUUID.Random();
+            SessionID = LLUUID.Random();
-                Hashtable InitialOutfitHash = new Hashtable();
+            SecureSessionID = LLUUID.Random();
-                InitialOutfitHash["folder_name"] = "Nightclub Female";
+            AgentID = LLUUID.Random();
-                InitialOutfitHash["gender"] = "female";
-                this.initialOutfit.Add(InitialOutfitHash);
+            Hashtable InitialOutfitHash = new Hashtable();
-          
+            InitialOutfitHash["folder_name"] = "Nightclub Female";
+            InitialOutfitHash["gender"] = "female";
+            initialOutfit.Add(InitialOutfitHash);
        } // SetDefaultValues
        #region Login Failure Methods
        public XmlRpcResponse GenerateFailureResponse(string reason, string message, string login)
        {
            // Overwrite any default values;
-            this.xmlRpcResponse = new XmlRpcResponse();
+            xmlRpcResponse = new XmlRpcResponse();
            // Ensure Login Failed message/reason;
-            this.ErrorMessage = message;
+            ErrorMessage = message;
-            this.ErrorReason = reason;
+            ErrorReason = reason;
-            this.loginError["reason"] = this.ErrorReason;
+            loginError["reason"] = ErrorReason;
-            this.loginError["message"] = this.ErrorMessage;
+            loginError["message"] = ErrorMessage;
-            this.loginError["login"] = login;
+            loginError["login"] = login;
-            this.xmlRpcResponse.Value = this.loginError;
+            xmlRpcResponse.Value = loginError;
-            return (this.xmlRpcResponse);
+            return (xmlRpcResponse);
        } // GenerateResponse
        public XmlRpcResponse CreateFailedResponse()
        {
-            return (this.CreateLoginFailedResponse());
+            return (CreateLoginFailedResponse());
        } // CreateErrorConnectingToGridResponse()
        public XmlRpcResponse CreateLoginFailedResponse()
        {
-            return (this.GenerateFailureResponse("key", "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", "false"));
+            return
+                (GenerateFailureResponse("key",
+                                         "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
+                                         "false"));
        } // LoginFailedResponse
        public XmlRpcResponse CreateAlreadyLoggedInResponse()
        {
-            return (this.GenerateFailureResponse("presence", "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner", "false"));
+            return
+                (GenerateFailureResponse("presence",
+                                         "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner",
+                                         "false"));
        } // CreateAlreadyLoggedInResponse()
        public XmlRpcResponse CreateDeadRegionResponse()
        {
-            return (this.GenerateFailureResponse("key", "The region you are attempting to log into is not responding. Please select another region and try again.", "false"));
+            return
+                (GenerateFailureResponse("key",
+                                         "The region you are attempting to log into is not responding. Please select another region and try again.",
+                                         "false"));
        }
-         public XmlRpcResponse CreateGridErrorResponse()
+        public XmlRpcResponse CreateGridErrorResponse()
        {
-            return (this.GenerateFailureResponse("key", "Error connecting to grid. Could not percieve credentials from login XML.", "false"));
+            return
+                (GenerateFailureResponse("key",
+                                         "Error connecting to grid. Could not percieve credentials from login XML.",
+                                         "false"));
        }
-        
        #endregion
        public XmlRpcResponse ToXmlRpcResponse()
        {
            try
            {
                Hashtable responseData = new Hashtable();
-                this.loginFlagsHash = new Hashtable();
+                loginFlagsHash = new Hashtable();
-                this.loginFlagsHash["daylight_savings"] = this.DST;
+                loginFlagsHash["daylight_savings"] = DST;
-                this.loginFlagsHash["stipend_since_login"] = this.StipendSinceLogin;
+                loginFlagsHash["stipend_since_login"] = StipendSinceLogin;
-                this.loginFlagsHash["gendered"] = this.Gendered;
+                loginFlagsHash["gendered"] = Gendered;
-                this.loginFlagsHash["ever_logged_in"] = this.EverLoggedIn;
+                loginFlagsHash["ever_logged_in"] = EverLoggedIn;
-                this.loginFlags.Add(this.loginFlagsHash);
+                loginFlags.Add(loginFlagsHash);
-                responseData["first_name"] = this.Firstname;
+                responseData["first_name"] = Firstname;
-                responseData["last_name"] = this.Lastname;
+                responseData["last_name"] = Lastname;
-                responseData["agent_access"] = this.agentAccess;
+                responseData["agent_access"] = agentAccess;
-                this.globalTexturesHash = new Hashtable();
+                globalTexturesHash = new Hashtable();
-                this.globalTexturesHash["sun_texture_id"] = this.SunTexture;
+                globalTexturesHash["sun_texture_id"] = SunTexture;
-                this.globalTexturesHash["cloud_texture_id"] = this.CloudTexture;
+                globalTexturesHash["cloud_texture_id"] = CloudTexture;
-                this.globalTexturesHash["moon_texture_id"] = this.MoonTexture;
+                globalTexturesHash["moon_texture_id"] = MoonTexture;
-                this.globalTextures.Add(this.globalTexturesHash);
+                globalTextures.Add(globalTexturesHash);
-               // this.eventCategories.Add(this.eventCategoriesHash);
+                // this.eventCategories.Add(this.eventCategoriesHash);
-                this.AddToUIConfig("allow_first_life", this.allowFirstLife);
+                AddToUIConfig("allow_first_life", allowFirstLife);
-                this.uiConfig.Add(this.uiConfigHash);
+                uiConfig.Add(uiConfigHash);
-                responseData["sim_port"] =(Int32) this.SimPort;
+                responseData["sim_port"] = (Int32) SimPort;
-                responseData["sim_ip"] = this.SimAddress;
+                responseData["sim_ip"] = SimAddress;
-                
-                responseData["agent_id"] = this.AgentID.ToStringHyphenated();
+                responseData["agent_id"] = AgentID.ToStringHyphenated();
-                responseData["session_id"] = this.SessionID.ToStringHyphenated();
+                responseData["session_id"] = SessionID.ToStringHyphenated();
-                responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
+                responseData["secure_session_id"] = SecureSessionID.ToStringHyphenated();
-                responseData["circuit_code"] = this.CircuitCode;
+                responseData["circuit_code"] = CircuitCode;
-                responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+                responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-                responseData["login-flags"] = this.loginFlags;
+                responseData["login-flags"] = loginFlags;
-                responseData["global-textures"] = this.globalTextures;
+                responseData["global-textures"] = globalTextures;
-                responseData["seed_capability"] = this.seedCapability;
+                responseData["seed_capability"] = seedCapability;
-                responseData["event_categories"] = this.eventCategories;
+                responseData["event_categories"] = eventCategories;
                responseData["event_notifications"] = new ArrayList(); // todo
-                responseData["classified_categories"] = this.classifiedCategories;
+                responseData["classified_categories"] = classifiedCategories;
-                responseData["ui-config"] = this.uiConfig;
+                responseData["ui-config"] = uiConfig;
-                responseData["inventory-skeleton"] = this.agentInventory;
+                responseData["inventory-skeleton"] = agentInventory;
-                responseData["inventory-skel-lib"] = this.inventoryLibrary;
+                responseData["inventory-skel-lib"] = inventoryLibrary;
-                responseData["inventory-root"] = this.inventoryRoot;
+                responseData["inventory-root"] = inventoryRoot;
                responseData["gestures"] = new ArrayList(); // todo
-                responseData["inventory-lib-owner"] = this.inventoryLibraryOwner;
+                responseData["inventory-lib-owner"] = inventoryLibraryOwner;
-                responseData["initial-outfit"] = this.initialOutfit;
+                responseData["initial-outfit"] = initialOutfit;
-                responseData["start_location"] = this.startLocation;
+                responseData["start_location"] = startLocation;
-                responseData["seed_capability"] = this.seedCapability;
+                responseData["seed_capability"] = seedCapability;
-                responseData["home"] = this.home;
+                responseData["home"] = home;
-                responseData["look_at"] = this.lookAt;
+                responseData["look_at"] = lookAt;
-                responseData["message"] = this.welcomeMessage;
+                responseData["message"] = welcomeMessage;
-                responseData["region_x"] = (Int32)this.RegionX * 256;
+                responseData["region_x"] = (Int32) RegionX*256;
-                responseData["region_y"] = (Int32)this.RegionY * 256;
+                responseData["region_y"] = (Int32) RegionY*256;
                //responseData["inventory-lib-root"] = new ArrayList(); // todo
                //responseData["buddy-list"] = new ArrayList(); // todo
                responseData["login"] = "true";
-                this.xmlRpcResponse.Value = responseData;
+                xmlRpcResponse.Value = responseData;
-                return (this.xmlRpcResponse);
+                return (xmlRpcResponse);
            }
            catch (Exception e)
            {
                MainLog.Instance.Warn(
                    "CLIENT",
                    "LoginResponse: Error creating XML-RPC Response: " + e.Message
-                );
+                    );
-                return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
+                return (GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
            }
        } // ToXmlRpcResponse
        public void SetEventCategories(string category, string value)
        {
-          //  this.eventCategoriesHash[category] = value;
+            //  this.eventCategoriesHash[category] = value;
            //TODO
        } // SetEventCategories
        public void AddToUIConfig(string itemName, string item)
        {
-            this.uiConfigHash[itemName] = item;
+            uiConfigHash[itemName] = item;
        } // SetUIConfig
        public void AddClassifiedCategory(Int32 ID, string categoryName)
@@ -315,372 +324,193 @@ namespace OpenSim.Framework.UserManagement
            Hashtable hash = new Hashtable();
            hash["category_name"] = categoryName;
            hash["category_id"] = ID;
-            this.classifiedCategories.Add(hash);
+            classifiedCategories.Add(hash);
            // this.classifiedCategoriesHash.Clear();
        } // SetClassifiedCategory
        #region Properties
        public string Login
        {
-            get
+            get { return login; }
-            {
+            set { login = value; }
-                return this.login;
-            }
-            set
-            {
-                this.login = value;
-            }
        } // Login
        public string DST
        {
-            get
+            get { return dst; }
-            {
+            set { dst = value; }
-                return this.dst;
-            }
-            set
-            {
-                this.dst = value;
-            }
        } // DST
        public string StipendSinceLogin
        {
-            get
+            get { return stipendSinceLogin; }
-            {
+            set { stipendSinceLogin = value; }
-                return this.stipendSinceLogin;
-            }
-            set
-            {
-                this.stipendSinceLogin = value;
-            }
        } // StipendSinceLogin
        public string Gendered
        {
-            get
+            get { return gendered; }
-            {
+            set { gendered = value; }
-                return this.gendered;
-            }
-            set
-            {
-                this.gendered = value;
-            }
        } // Gendered
        public string EverLoggedIn
        {
-            get
+            get { return everLoggedIn; }
-            {
+            set { everLoggedIn = value; }
-                return this.everLoggedIn;
-            }
-            set
-            {
-                this.everLoggedIn = value;
-            }
        } // EverLoggedIn
        public int SimPort
        {
-            get
+            get { return simPort; }
-            {
+            set { simPort = value; }
-                return this.simPort;
-            }
-            set
-            {
-                this.simPort = value;
-            }
        } // SimPort
        public string SimAddress
        {
-            get
+            get { return simAddress; }
-            {
+            set { simAddress = value; }
-                return this.simAddress;
-            }
-            set
-            {
-                this.simAddress = value;
-            }
        } // SimAddress
        public LLUUID AgentID
        {
-            get
+            get { return agentID; }
-            {
+            set { agentID = value; }
-                return this.agentID;
-            }
-            set
-            {
-                this.agentID = value;
-            }
        } // AgentID
        public LLUUID SessionID
        {
-            get
+            get { return sessionID; }
-            {
+            set { sessionID = value; }
-                return this.sessionID;
-            }
-            set
-            {
-                this.sessionID = value;
-            }
        } // SessionID
        public LLUUID SecureSessionID
        {
-            get
+            get { return secureSessionID; }
-            {
+            set { secureSessionID = value; }
-                return this.secureSessionID;
-            }
-            set
-            {
-                this.secureSessionID = value;
-            }
        } // SecureSessionID
        public Int32 CircuitCode
        {
-            get
+            get { return circuitCode; }
-            {
+            set { circuitCode = value; }
-                return this.circuitCode;
-            }
-            set
-            {
-                this.circuitCode = value;
-            }
        } // CircuitCode
        public uint RegionX
        {
-            get
+            get { return regionX; }
-            {
+            set { regionX = value; }
-                return this.regionX;
-            }
-            set
-            {
-                this.regionX = value;
-            }
        } // RegionX
        public uint RegionY
        {
-            get
+            get { return regionY; }
-            {
+            set { regionY = value; }
-                return this.regionY;
-            }
-            set
-            {
-                this.regionY = value;
-            }
        } // RegionY
        public string SunTexture
        {
-            get
+            get { return sunTexture; }
-            {
+            set { sunTexture = value; }
-                return this.sunTexture;
-            }
-            set
-            {
-                this.sunTexture = value;
-            }
        } // SunTexture
        public string CloudTexture
        {
-            get
+            get { return cloudTexture; }
-            {
+            set { cloudTexture = value; }
-                return this.cloudTexture;
-            }
-            set
-            {
-                this.cloudTexture = value;
-            }
        } // CloudTexture
        public string MoonTexture
        {
-            get
+            get { return moonTexture; }
-            {
+            set { moonTexture = value; }
-                return this.moonTexture;
-            }
-            set
-            {
-                this.moonTexture = value;
-            }
        } // MoonTexture
        public string Firstname
        {
-            get
+            get { return firstname; }
-            {
+            set { firstname = value; }
-                return this.firstname;
-            }
-            set
-            {
-                this.firstname = value;
-            }
        } // Firstname
        public string Lastname
        {
-            get
+            get { return lastname; }
-            {
+            set { lastname = value; }
-                return this.lastname;
-            }
-            set
-            {
-                this.lastname = value;
-            }
        } // Lastname
        public string AgentAccess
        {
-            get
+            get { return agentAccess; }
-            {
+            set { agentAccess = value; }
-                return this.agentAccess;
-            }
-            set
-            {
-                this.agentAccess = value;
-            }
        }
        public string StartLocation
        {
-            get
+            get { return startLocation; }
-            {
+            set { startLocation = value; }
-                return this.startLocation;
-            }
-            set
-            {
-                this.startLocation = value;
-            }
        } // StartLocation
        public string LookAt
        {
-            get
+            get { return lookAt; }
-            {
+            set { lookAt = value; }
-                return this.lookAt;
-            }
-            set
-            {
-                this.lookAt = value;
-            }
        }
        public string SeedCapability
        {
-            get
+            get { return seedCapability; }
-            {
+            set { seedCapability = value; }
-                return this.seedCapability;
-            }
-            set
-            {
-                this.seedCapability = value;
-            }
        } // SeedCapability
        public string ErrorReason
        {
-            get
+            get { return errorReason; }
-            {
+            set { errorReason = value; }
-                return this.errorReason;
-            }
-            set
-            {
-                this.errorReason = value;
-            }
        } // ErrorReason
        public string ErrorMessage
        {
-            get
+            get { return errorMessage; }
-            {
+            set { errorMessage = value; }
-                return this.errorMessage;
-            }
-            set
-            {
-                this.errorMessage = value;
-            }
        } // ErrorMessage
        public ArrayList InventoryRoot
        {
-            get
+            get { return inventoryRoot; }
-            {
+            set { inventoryRoot = value; }
-                return this.inventoryRoot;
-            }
-            set
-            {
-                this.inventoryRoot = value;
-            }
        }
        public ArrayList InventorySkeleton
        {
-            get
+            get { return agentInventory; }
-            {
+            set { agentInventory = value; }
-                return this.agentInventory;
-            }
-            set
-            {
-                this.agentInventory = value;
-            }
        }
        public ArrayList InventoryLibrary
        {
-            get
+            get { return inventoryLibrary; }
-            {
+            set { inventoryLibrary = value; }
-                return this.inventoryLibrary;
-            }
-            set
-            {
-                this.inventoryLibrary = value;
-            }
        }
        public ArrayList InventoryLibraryOwner
        {
-            get
+            get { return inventoryLibraryOwner; }
-            {
+            set { inventoryLibraryOwner = value; }
-                return this.inventoryLibraryOwner;
-            }
-            set
-            {
-                this.inventoryLibraryOwner = value;
-            }
        }
        public string Home
        {
-            get
+            get { return home; }
-            {
+            set { home = value; }
-                return this.home;
-            }
-            set
-            {
-                this.home = value;
-            }
        }
        public string Message
        {
-            get
+            get { return welcomeMessage; }
-            {
+            set { welcomeMessage = value; }
-                return this.welcomeMessage;
-            }
-            set
-            {
-                this.welcomeMessage = value;
-            }
        }
-        #endregion
+        #endregion
        public class UserInfo
        {
@@ -691,6 +521,4 @@ namespace OpenSim.Framework.UserManagement
            public LLVector3 homelookat;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 66b91e1..497cc5d 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -28,16 +28,10 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Security.Cryptography;
 using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Console;
-using OpenSim.Framework;
-using InventoryFolder = OpenSim.Framework.InventoryFolder;
 namespace OpenSim.Framework.UserManagement
 {
    public class LoginService
@@ -61,12 +55,12 @@ namespace OpenSim.Framework.UserManagement
        /// <returns>The response to send</returns>
        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
        {
+            MainLog.Instance.Verbose("LOGIN", "Attempting login now...");
-            MainLog.Instance.Verbose("LOGIN","Attempting login now...");
            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable requestData = (Hashtable) request.Params[0];
-            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
+            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") &&
+                            requestData.Contains("passwd"));
            bool GoodLogin = false;
            UserProfileData userProfile;
@@ -74,9 +68,9 @@ namespace OpenSim.Framework.UserManagement
            if (GoodXML)
            {
-                string firstname = (string)requestData["first"];
+                string firstname = (string) requestData["first"];
-                string lastname = (string)requestData["last"];
+                string lastname = (string) requestData["last"];
-                string passwd = (string)requestData["passwd"];
+                string passwd = (string) requestData["passwd"];
                userProfile = GetTheUser(firstname, lastname);
                if (userProfile == null)
@@ -110,7 +104,7 @@ namespace OpenSim.Framework.UserManagement
                    LLUUID agentID = userProfile.UUID;
                    // Inventory Library Section
-                    InventoryData inventData = this.CreateInventoryData(agentID);
+                    InventoryData inventData = CreateInventoryData(agentID);
                    ArrayList AgentInventoryArray = inventData.InventoryArray;
                    Hashtable InventoryRootHash = new Hashtable();
@@ -120,7 +114,7 @@ namespace OpenSim.Framework.UserManagement
                    userProfile.rootInventoryFolderID = inventData.RootFolderID;
                    // Circuit Code
-                    uint circode = (uint)(Util.RandomClass.Next());
+                    uint circode = (uint) (Util.RandomClass.Next());
                    logResponse.Lastname = userProfile.surname;
                    logResponse.Firstname = userProfile.username;
@@ -129,20 +123,20 @@ namespace OpenSim.Framework.UserManagement
                    logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated();
                    logResponse.InventoryRoot = InventoryRoot;
                    logResponse.InventorySkeleton = AgentInventoryArray;
-                    logResponse.InventoryLibrary = this.GetInventoryLibrary();
+                    logResponse.InventoryLibrary = GetInventoryLibrary();
-                    logResponse.InventoryLibraryOwner = this.GetLibraryOwner();
+                    logResponse.InventoryLibraryOwner = GetLibraryOwner();
-                    logResponse.CircuitCode = (Int32)circode;
+                    logResponse.CircuitCode = (Int32) circode;
                    //logResponse.RegionX = 0; //overwritten
                    //logResponse.RegionY = 0; //overwritten
-                    logResponse.Home = "!!null temporary value {home}!!";   // Overwritten
+                    logResponse.Home = "!!null temporary value {home}!!"; // Overwritten
                    //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
                    //logResponse.SimAddress = "127.0.0.1"; //overwritten
                    //logResponse.SimPort = 0; //overwritten
-                    logResponse.Message = this.GetMessage();
+                    logResponse.Message = GetMessage();
                    try
                    {
-                        this.CustomiseResponse(logResponse, userProfile);
+                        CustomiseResponse(logResponse, userProfile);
                    }
                    catch (Exception e)
                    {
@@ -152,7 +146,6 @@ namespace OpenSim.Framework.UserManagement
                    }
                    CommitAgent(ref userProfile);
                    return logResponse.ToXmlRpcResponse();
                }
                catch (Exception E)
@@ -162,7 +155,6 @@ namespace OpenSim.Framework.UserManagement
                //}
            }
            return response;
        }
        /// <summary>
@@ -174,7 +166,7 @@ namespace OpenSim.Framework.UserManagement
        {
        }
-         /// <summary>
+        /// <summary>
        /// Saves a target agent to the database
        /// </summary>
        /// <param name="profile">The users profile</param>
@@ -194,8 +186,7 @@ namespace OpenSim.Framework.UserManagement
        /// <returns>Authenticated?</returns>
        public virtual bool AuthenticateUser(UserProfileData profile, string password)
        {
-            
+            MainLog.Instance.Verbose("LOGIN", "Authenticating " + profile.username + " " + profile.surname);
-            MainLog.Instance.Verbose("LOGIN","Authenticating " + profile.username + " " + profile.surname);
            password = password.Remove(0, 3); //remove $1$
@@ -211,7 +202,7 @@ namespace OpenSim.Framework.UserManagement
        /// <param name="request"></param>
        public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
        {
-            this.m_userManager.CreateAgent(profile, request);
+            m_userManager.CreateAgent(profile, request);
        }
        /// <summary>
@@ -222,7 +213,7 @@ namespace OpenSim.Framework.UserManagement
        /// <returns></returns>
        public virtual UserProfileData GetTheUser(string firstname, string lastname)
        {
-            return this.m_userManager.GetUserProfile(firstname, lastname);
+            return m_userManager.GetUserProfile(firstname, lastname);
        }
        /// <summary>
@@ -286,8 +277,8 @@ namespace OpenSim.Framework.UserManagement
                TempHash = new Hashtable();
                TempHash["name"] = InvFolder.FolderName;
                TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
-                TempHash["version"] = (Int32)InvFolder.Version;
+                TempHash["version"] = (Int32) InvFolder.Version;
-                TempHash["type_default"] = (Int32)InvFolder.DefaultType;
+                TempHash["type_default"] = (Int32) InvFolder.DefaultType;
                TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
                AgentInventoryArray.Add(TempHash);
            }
@@ -307,4 +298,4 @@ namespace OpenSim.Framework.UserManagement
            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index 43fce84..a812ac9 100644
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -27,25 +27,29 @@
 */
 using System.Reflection;
 using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Communications")]
-[assembly: AssemblyDescription("")]
+[assembly : AssemblyTitle("OpenGrid.Framework.Communications")]
-[assembly: AssemblyConfiguration("")]
+[assembly : AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
+[assembly : AssemblyConfiguration("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Communications")]
+[assembly : AssemblyCompany("")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly : AssemblyProduct("OpenGrid.Framework.Communications")]
-[assembly: AssemblyTrademark("")]
+[assembly : AssemblyCopyright("Copyright �  2007")]
-[assembly: AssemblyCulture("")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly : ComVisible(false)]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("13e7c396-78a9-4a5c-baf2-6f980ea75d95")]
+[assembly : Guid("13e7c396-78a9-4a5c-baf2-6f980ea75d95")]
 // Version information for an assembly consists of the following four values:
 //
@@ -56,5 +60,6 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly : AssemblyVersion("1.0.0.0")]
+[assembly : AssemblyFileVersion("1.0.0.0")]
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/RestClient/GenericAsyncResult.cs b/OpenSim/Framework/Communications/RestClient/GenericAsyncResult.cs
index c821fa4..72d8f65 100644
--- a/OpenSim/Framework/Communications/RestClient/GenericAsyncResult.cs
+++ b/OpenSim/Framework/Communications/RestClient/GenericAsyncResult.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 namespace OpenSim.Framework.Communications
 {
    internal class SimpleAsyncResult : IAsyncResult
    {
        private readonly AsyncCallback m_callback;
        /// <summary>
@@ -36,7 +33,6 @@ namespace OpenSim.Framework.Communications
            m_completedSynchronously = 1;
        }
        #region IAsyncResult Members
        public object AsyncState
@@ -45,7 +41,6 @@ namespace OpenSim.Framework.Communications
        }
        public WaitHandle AsyncWaitHandle
        {
            get
@@ -82,19 +77,18 @@ namespace OpenSim.Framework.Communications
            get { return Thread.VolatileRead(ref m_completed) == 1; }
        }
        #endregion
        #region class Methods
        internal void SetAsCompleted(bool completedSynchronously)
        {
            m_completed = 1;
-            if(completedSynchronously)
+            if (completedSynchronously)
                m_completedSynchronously = 1;
            else
                m_completedSynchronously = 0;
-            
            SignalCompletion();
        }
@@ -112,9 +106,9 @@ namespace OpenSim.Framework.Communications
        private void SignalCompletion()
        {
-            if(m_waitHandle != null) m_waitHandle.Set();
+            if (m_waitHandle != null) m_waitHandle.Set();
-            if(m_callback != null) m_callback(this);
+            if (m_callback != null) m_callback(this);
        }
        public void EndInvoke()
@@ -125,14 +119,14 @@ namespace OpenSim.Framework.Communications
                // If the operation isn't done, wait for it
                AsyncWaitHandle.WaitOne();
                AsyncWaitHandle.Close();
-                m_waitHandle = null;  // Allow early GC
+                m_waitHandle = null; // Allow early GC
            }
            // Operation is done: if an exception occured, throw it
            if (m_exception != null) throw m_exception;
-        }       
+        }
-        #endregion 
+        #endregion
    }
    internal class AsyncResult<T> : SimpleAsyncResult
@@ -140,10 +134,12 @@ namespace OpenSim.Framework.Communications
        private T m_result = default(T);
        public AsyncResult(AsyncCallback asyncCallback, Object state) :
-            base(asyncCallback, state) { }
+            base(asyncCallback, state)
+        {
+        }
-        public void SetAsCompleted(T result,  bool completedSynchronously)
+        public void SetAsCompleted(T result, bool completedSynchronously)
        {
            // Save the asynchronous operation's result
            m_result = result;
@@ -153,11 +149,10 @@ namespace OpenSim.Framework.Communications
            base.SetAsCompleted(completedSynchronously);
        }
-        new public T EndInvoke()
+        public new T EndInvoke()
        {
-            base.EndInvoke(); 
+            base.EndInvoke();
-            return m_result;  
+            return m_result;
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index 392669f..ac3a287 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -1,12 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Web;
 using System.Text;
-using System.Collections.Generic;
 using System.Threading;
+using System.Web;
-using OpenSim.Framework.Console;
 namespace OpenSim.Framework.Communications
 {
@@ -29,9 +27,10 @@ namespace OpenSim.Framework.Communications
    /// </remarks>
    public class RestClient
    {
+        private string realuri;
-        string realuri;
        #region member variables
        /// <summary>
        /// The base Uri of the web-service e.g. http://www.google.com 
        /// </summary>
@@ -60,7 +59,7 @@ namespace OpenSim.Framework.Communications
        /// <summary>
        /// MemoryStream representing the resultiong resource
        /// </summary>
-        Stream _resource;
+        private Stream _resource;
        /// <summary>
        /// WebRequest object, held as a member variable
@@ -80,12 +79,12 @@ namespace OpenSim.Framework.Communications
        /// <summary>
        /// Default time out period
        /// </summary>
-        const int DefaultTimeout = 10 * 1000; // 10 seconds timeout
+        private const int DefaultTimeout = 10*1000; // 10 seconds timeout
        /// <summary>
        /// Default Buffer size of a block requested from the web-server
        /// </summary>
-        const int BufferSize = 4096; // Read blocks of 4 KB.
+        private const int BufferSize = 4096; // Read blocks of 4 KB.
        /// <summary>
@@ -97,6 +96,7 @@ namespace OpenSim.Framework.Communications
        #endregion member variables
        #region constructors
        /// <summary>
        /// Instantiate a new RestClient
        /// </summary>
@@ -111,7 +111,8 @@ namespace OpenSim.Framework.Communications
            _lock = new object();
        }
-        object _lock;
+        private object _lock;
        #endregion constructors
        /// <summary>
@@ -120,8 +121,8 @@ namespace OpenSim.Framework.Communications
        /// <param name="element">path entry</param>
        public void AddResourcePath(string element)
        {
-            if(isSlashed(element))
+            if (isSlashed(element))
-                _pathElements.Add(element.Substring(0, element.Length-1));
+                _pathElements.Add(element.Substring(0, element.Length - 1));
            else
                _pathElements.Add(element);
        }
@@ -178,7 +179,7 @@ namespace OpenSim.Framework.Communications
        /// Build a Uri based on the intial Url, path elements and parameters
        /// </summary>
        /// <returns>fully constructed Uri</returns>
-        Uri buildUri()
+        private Uri buildUri()
        {
            StringBuilder sb = new StringBuilder();
            sb.Append(_url);
@@ -196,7 +197,8 @@ namespace OpenSim.Framework.Communications
                {
                    sb.Append("?");
                    firstElement = false;
-                } else
+                }
+                else
                    sb.Append("&");
                sb.Append(kv.Key);
@@ -209,7 +211,9 @@ namespace OpenSim.Framework.Communications
            realuri = sb.ToString();
            return new Uri(sb.ToString());
        }
        #region Async communications with server
        /// <summary>
        /// Async method, invoked when a block of data has been received from the service
        /// </summary>
@@ -218,13 +222,14 @@ namespace OpenSim.Framework.Communications
        {
            try
            {
-                Stream s = (Stream)ar.AsyncState;
+                Stream s = (Stream) ar.AsyncState;
                int read = s.EndRead(ar);
                if (read > 0)
                {
                    _resource.Write(_readbuf, 0, read);
-                    IAsyncResult asynchronousResult = s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
+                    IAsyncResult asynchronousResult =
+                        s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
                    // TODO! Implement timeout, without killing the server
                    //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
@@ -251,12 +256,13 @@ namespace OpenSim.Framework.Communications
            try
            {
                // grab response
-                WebRequest wr = (WebRequest)ar.AsyncState;
+                WebRequest wr = (WebRequest) ar.AsyncState;
-                _response = (HttpWebResponse)wr.EndGetResponse(ar);
+                _response = (HttpWebResponse) wr.EndGetResponse(ar);
                // get response stream, and setup async reading
                Stream s = _response.GetResponseStream();
-                IAsyncResult asynchronousResult = s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
+                IAsyncResult asynchronousResult =
+                    s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
                // TODO! Implement timeout, without killing the server
                // wait until completed, or we timed out
@@ -281,6 +287,7 @@ namespace OpenSim.Framework.Communications
                }
            }
        }
        #endregion Async communications with server
        /// <summary>
@@ -290,17 +297,17 @@ namespace OpenSim.Framework.Communications
        {
            lock (_lock)
            {
-                _request = (HttpWebRequest)WebRequest.Create(buildUri());
+                _request = (HttpWebRequest) WebRequest.Create(buildUri());
                _request.KeepAlive = false;
                _request.ContentType = "application/xml";
                _request.Timeout = 200000;
                _asyncException = null;
 //                IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
-                _response = (HttpWebResponse)_request.GetResponse();
+                _response = (HttpWebResponse) _request.GetResponse();
                Stream src = _response.GetResponseStream();
                int length = src.Read(_readbuf, 0, BufferSize);
-                while(length > 0)
+                while (length > 0)
                {
                    _resource.Write(_readbuf, 0, length);
                    length = src.Read(_readbuf, 0, BufferSize);
@@ -329,7 +336,7 @@ namespace OpenSim.Framework.Communications
        public Stream Request(Stream src)
        {
-            _request = (HttpWebRequest)WebRequest.Create(buildUri());
+            _request = (HttpWebRequest) WebRequest.Create(buildUri());
            _request.KeepAlive = false;
            _request.ContentType = "application/xml";
            _request.Timeout = 900000;
@@ -340,13 +347,13 @@ namespace OpenSim.Framework.Communications
            src.Seek(0, SeekOrigin.Begin);
            Stream dst = _request.GetRequestStream();
            byte[] buf = new byte[1024];
-            int length = src.Read(buf,0, 1024);
+            int length = src.Read(buf, 0, 1024);
            while (length > 0)
            {
                dst.Write(buf, 0, length);
                length = src.Read(buf, 0, 1024);
            }
-            _response = (HttpWebResponse)_request.GetResponse();
+            _response = (HttpWebResponse) _request.GetResponse();
 //            IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
@@ -357,8 +364,8 @@ namespace OpenSim.Framework.Communications
            return null;
        }
        #region Async Invocation
        public IAsyncResult BeginRequest(AsyncCallback callback, object state)
        {
            /// <summary>
@@ -371,7 +378,7 @@ namespace OpenSim.Framework.Communications
        public Stream EndRequest(IAsyncResult asyncResult)
        {
-            AsyncResult<Stream> ar = (AsyncResult<Stream>)asyncResult;
+            AsyncResult<Stream> ar = (AsyncResult<Stream>) asyncResult;
            // Wait for operation to complete, then return result or 
            // throw exception
@@ -381,7 +388,7 @@ namespace OpenSim.Framework.Communications
        private void RequestHelper(Object asyncResult)
        {
            // We know that it's really an AsyncResult<DateTime> object
-            AsyncResult<Stream> ar = (AsyncResult<Stream>)asyncResult;
+            AsyncResult<Stream> ar = (AsyncResult<Stream>) asyncResult;
            try
            {
                // Perform the operation; if sucessful set the result
@@ -394,6 +401,7 @@ namespace OpenSim.Framework.Communications
                ar.HandleException(e, false);
            }
        }
        #endregion Async Invocation
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 006c8ee..cdc3baf 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -33,18 +33,15 @@ using System.Reflection;
 using System.Security.Cryptography;
 using libsecondlife;
 using Nwc.XmlRpc;
-using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 namespace OpenSim.Framework.UserManagement
 {
    public abstract class UserManagerBase : IUserService
    {
        public UserConfig _config;
-        Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
+        private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
        /// <summary>
        /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
@@ -78,11 +75,12 @@ namespace OpenSim.Framework.UserManagement
        public void AddPlugin(IUserData plug)
        {
            plug.Initialise();
-            this._plugins.Add(plug.getName(), plug);
+            _plugins.Add(plug.getName(), plug);
-            MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
+            MainLog.Instance.Verbose("Userstorage: Added IUserData Interface");
        }
        #region Get UserProfile 
        /// <summary>
        /// Loads a user profile from a database by UUID
        /// </summary>
@@ -100,7 +98,7 @@ namespace OpenSim.Framework.UserManagement
                }
                catch (Exception e)
                {
-                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                }
            }
@@ -126,7 +124,7 @@ namespace OpenSim.Framework.UserManagement
                catch (Exception e)
                {
                    System.Console.WriteLine("EEK!");
-                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                }
            }
@@ -145,7 +143,7 @@ namespace OpenSim.Framework.UserManagement
            {
                try
                {
-                    UserProfileData profile = plugin.Value.GetUserByName(fname,lname);
+                    UserProfileData profile = plugin.Value.GetUserByName(fname, lname);
                    profile.currentAgent = getUserAgent(profile.UUID);
@@ -153,7 +151,7 @@ namespace OpenSim.Framework.UserManagement
                }
                catch (Exception e)
                {
-                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                }
            }
@@ -170,20 +168,24 @@ namespace OpenSim.Framework.UserManagement
        {
            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
            {
-                try {
+                try
+                {
                    plugin.Value.UpdateUserProfile(data);
                    return true;
-                } catch (Exception e) {
+                }
-                    MainLog.Instance.Verbose( "Unable to set user via " + plugin.Key + "(" + e.ToString() + ")");
+                catch (Exception e)
+                {
+                    MainLog.Instance.Verbose("Unable to set user via " + plugin.Key + "(" + e.ToString() + ")");
                }
            }
-            
            return false;
        }
        #endregion
        #region Get UserAgent
        /// <summary>
        /// Loads a user agent by uuid (not called directly)
        /// </summary>
@@ -199,7 +201,7 @@ namespace OpenSim.Framework.UserManagement
                }
                catch (Exception e)
                {
-                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                }
            }
@@ -221,7 +223,7 @@ namespace OpenSim.Framework.UserManagement
                }
                catch (Exception e)
                {
-                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                }
            }
@@ -249,11 +251,11 @@ namespace OpenSim.Framework.UserManagement
            {
                try
                {
-                    return plugin.Value.GetAgentByName(fname,lname);
+                    return plugin.Value.GetAgentByName(fname, lname);
                }
                catch (Exception e)
                {
-                    MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                    MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                }
            }
@@ -263,6 +265,7 @@ namespace OpenSim.Framework.UserManagement
        #endregion
        #region CreateAgent
        /// <summary>
        /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB
        /// </summary>
@@ -270,7 +273,7 @@ namespace OpenSim.Framework.UserManagement
        /// <param name="request">The users loginrequest</param>
        public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
        {
-            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable requestData = (Hashtable) request.Params[0];
            UserAgentData agent = new UserAgentData();
@@ -297,7 +300,7 @@ namespace OpenSim.Framework.UserManagement
            // If user specified additional start, use that
            if (requestData.ContainsKey("start"))
            {
-                string startLoc = ((string)requestData["start"]).Trim();
+                string startLoc = ((string) requestData["start"]).Trim();
                if (!(startLoc == "last" || startLoc == "home"))
                {
                    // Format: uri:Ahern&162&213&34
@@ -312,7 +315,6 @@ namespace OpenSim.Framework.UserManagement
                    }
                    catch (Exception)
                    {
                    }
                }
            }
@@ -323,7 +325,7 @@ namespace OpenSim.Framework.UserManagement
            // Current location
            agent.regionID = new LLUUID(); // Fill in later
-            agent.currentRegion = new LLUUID();      // Fill in later
+            agent.currentRegion = new LLUUID(); // Fill in later
            profile.currentAgent = agent;
        }
@@ -364,7 +366,6 @@ namespace OpenSim.Framework.UserManagement
                try
                {
                    plugin.Value.AddNewUserProfile(user);
                }
                catch (Exception e)
                {
@@ -376,4 +377,4 @@ namespace OpenSim.Framework.UserManagement
        public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
        public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
    }
-}
+}
+\ No newline at end of file