10 files changed, 86 insertions, 88 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index ba95426..3a4f729 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -117,7 +117,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     m_application = openSim;
                     string bind_ip_address = m_config.GetString("bind_ip_address", "0.0.0.0");
-                    IPAddress ipaddr = IPAddress.Parse( bind_ip_address );
+                    IPAddress ipaddr = IPAddress.Parse(bind_ip_address);
                     m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr);
 
                     Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>();
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 7b14ac7..cc9fcea 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Framework
             args["inventory_folder"] = OSD.FromUUID(InventoryFolder);
             args["secure_session_id"] = OSD.FromUUID(SecureSessionID);
             args["session_id"] = OSD.FromUUID(SessionID);
-            
+
             args["service_session_id"] = OSD.FromString(ServiceSessionID);
             args["start_pos"] = OSD.FromString(startpos.ToString());
             args["client_ip"] = OSD.FromString(IPAddress);
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
                 OSDMap appmap = Appearance.Pack();
                 args["packed_appearance"] = appmap;
             }
-            
+
             if (ServiceURLs != null && ServiceURLs.Count > 0)
             {
                 OSDArray urls = new OSDArray(ServiceURLs.Count * 2);
@@ -307,7 +307,7 @@ namespace OpenSim.Framework
 // DEBUG OFF
             
             try {
-            // Unpack various appearance elements                                                                           
+            // Unpack various appearance elements
             Appearance = new AvatarAppearance(AgentID);
 
             // Eventually this code should be deprecated, use full appearance
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 69e1ae6..2906af8 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework
 
         public readonly static int TEXTURE_COUNT = 21;
         public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
-        
+
         protected UUID m_owner;
         protected int m_serial = 1;
         protected byte[] m_visualparams;
@@ -110,10 +110,10 @@ namespace OpenSim.Framework
             SetDefaultTexture();
             SetDefaultParams();
             SetHeight();
-            
+
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
         }
-        
+
         public AvatarAppearance(UUID avatarID, OSDMap map)
         {
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID);
@@ -122,11 +122,11 @@ namespace OpenSim.Framework
             Unpack(map);
             SetHeight();
         }
-        
+
         public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
         {
 //            m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID);
-            
+
             m_serial = 1;
             m_owner = avatarID;
 
@@ -134,7 +134,7 @@ namespace OpenSim.Framework
                 m_wearables = wearables;
             else
                 SetDefaultWearables();
-            
+
             if (textureEntry != null)
                 m_texture = textureEntry;
             else
@@ -172,41 +172,41 @@ namespace OpenSim.Framework
 
                 return;
             }
-            
+
             m_serial = appearance.Serial;
             m_owner = appearance.Owner;
 
             m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
-            for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
+            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 m_wearables[i] = new AvatarWearable();
             if (copyWearables && (appearance.Wearables != null))
             {
                 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                     SetWearable(i,appearance.Wearables[i]);
             }
-            
+
             m_texture = null;
             if (appearance.Texture != null)
             {
                 byte[] tbytes = appearance.Texture.GetBytes();
                 m_texture = new Primitive.TextureEntry(tbytes,0,tbytes.Length);
             }
-            
+
             m_visualparams = null;
             if (appearance.VisualParams != null)
                 m_visualparams = (byte[])appearance.VisualParams.Clone();
-            
+
             // Copy the attachment, force append mode since that ensures consistency
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
             foreach (AvatarAttachment attachment in appearance.GetAttachments())
                 AppendAttachment(new AvatarAttachment(attachment));
         }
-        
+
         public void GetAssetsFrom(AvatarAppearance app)
         {
-            for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
+            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
             {
-                for (int j = 0 ; j < m_wearables[i].Count ; j++)
+                for (int j = 0; j < m_wearables[i].Count; j++)
                 {
                     UUID itemID = m_wearables[i][j].ItemID;
                     UUID assetID = app.Wearables[i].GetAsset(itemID);
@@ -220,7 +220,7 @@ namespace OpenSim.Framework
         public void ClearWearables()
         {
             m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
-            for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
+            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 m_wearables[i] = new AvatarWearable();
         }
 
@@ -248,7 +248,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Set up appearance textures.
         /// Returns boolean that indicates whether the new entries actually change the
-        /// existing values. 
+        /// existing values.
         /// </summary>
         public virtual bool SetTextureEntries(Primitive.TextureEntry textureEntry)
         {
@@ -263,7 +263,7 @@ namespace OpenSim.Framework
             {
                 Primitive.TextureEntryFace newface = textureEntry.FaceTextures[i];
                 Primitive.TextureEntryFace oldface = m_texture.FaceTextures[i];
-                    
+
                 if (newface == null)
                 {
                     if (oldface == null) continue;
@@ -274,7 +274,7 @@ namespace OpenSim.Framework
                 }
 
                 changed = true;
-                
+
 //                if (newface != null)
 //                    m_log.WarnFormat("[AVATAR APPEARANCE]: index {0}, new texture id {1}",i,newface.TextureID);
             }
@@ -282,11 +282,11 @@ namespace OpenSim.Framework
             m_texture = textureEntry;
             return changed;
         }
-        
+
         /// <summary>
         /// Set up visual parameters for the avatar and refresh the avatar height
         /// Returns boolean that indicates whether the new entries actually change the
-        /// existing values. 
+        /// existing values.
         /// </summary>
         public virtual bool SetVisualParams(byte[] visualParams)
         {
@@ -316,13 +316,13 @@ namespace OpenSim.Framework
 
             return changed;
         }
-    
+
         public virtual void SetAppearance(Primitive.TextureEntry textureEntry, byte[] visualParams)
         {
             SetTextureEntries(textureEntry);
             SetVisualParams(visualParams);
         }
-        
+
         public virtual void SetHeight()
         {
             m_avatarHeight = 1.23077f  // Shortest possible avatar height
@@ -347,25 +347,24 @@ namespace OpenSim.Framework
 //          m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID);
 // DEBUG OFF
             m_wearables[wearableId].Clear();
-            for (int i = 0 ; i < wearable.Count ; i++)
+            for (int i = 0; i < wearable.Count; i++)
                 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
         }
 
-
 // DEBUG ON
         public override String ToString()
         {
             String s = "";
 
             s += String.Format("Serial: {0}\n",m_serial);
-            
+
             for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
                 if (m_texture.FaceTextures[i] != null)
                     s += String.Format("Texture: {0} --> {1}\n",i,m_texture.FaceTextures[i].TextureID);
 
             foreach (AvatarWearable awear in m_wearables)
             {
-                for ( int i = 0 ; i < awear.Count ; i++ )
+                for (int i = 0; i < awear.Count; i++)
                     s += String.Format("Wearable: item={0}, asset={1}\n",awear[i].ItemID,awear[i].AssetID);
             }
 
@@ -373,13 +372,13 @@ namespace OpenSim.Framework
             for (uint j = 0; j < AvatarAppearance.VISUALPARAM_COUNT; j++)
                 s += String.Format("{0},",m_visualparams[j]);
             s += "\n";
-            
+
             return s;
         }
 // DEBUG OFF
 
         /// <summary>
-        /// Get a list of the attachments, note that there may be 
+        /// Get a list of the attachments, note that there may be
         /// duplicate attachpoints
         /// </summary>
         public List<AvatarAttachment> GetAttachments()
@@ -390,10 +389,10 @@ namespace OpenSim.Framework
                 foreach (AvatarAttachment attach in kvp.Value)
                     alist.Add(new AvatarAttachment(attach));
             }
-            
+
             return alist;
         }
-        
+
         internal void AppendAttachment(AvatarAttachment attach)
         {
             if (! m_attachments.ContainsKey(attach.AttachPoint))
@@ -406,11 +405,11 @@ namespace OpenSim.Framework
             m_attachments[attach.AttachPoint] = new List<AvatarAttachment>();
             m_attachments[attach.AttachPoint].Add(attach);
         }
-        
+
         /// <summary>
-        /// Add an attachment, if the attachpoint has the 
+        /// Add an attachment, if the attachpoint has the
         /// 0x80 bit set then we assume this is an append
-        /// operation otherwise we replace whatever is 
+        /// operation otherwise we replace whatever is
         /// currently attached at the attachpoint
         /// </summary>
         public void SetAttachment(int attachpoint, UUID item, UUID asset)
@@ -485,14 +484,14 @@ namespace OpenSim.Framework
             data["serial"] = OSD.FromInteger(m_serial);
             data["height"] = OSD.FromReal(m_avatarHeight);
             data["hipoffset"] = OSD.FromReal(m_hipOffset);
-            
+
             // Wearables
             OSDArray wears = new OSDArray(AvatarWearable.MAX_WEARABLES);
-            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) 
+            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 wears.Add(m_wearables[i].Pack());
             data["wearables"] = wears;
 
-            // Avatar Textures 
+            // Avatar Textures
             OSDArray textures = new OSDArray(AvatarAppearance.TEXTURE_COUNT);
             for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
             {
@@ -506,7 +505,7 @@ namespace OpenSim.Framework
             // Visual Parameters
             OSDBinary visualparams = new OSDBinary(m_visualparams);
             data["visualparams"] = visualparams;
-            
+
             // Attachments
             OSDArray attachs = new OSDArray(m_attachments.Count);
             foreach (AvatarAttachment attach in GetAttachments())
@@ -529,14 +528,14 @@ namespace OpenSim.Framework
             if ((data != null) && (data["hipoffset"] != null))
                 m_hipOffset = (float)data["hipoffset"].AsReal();
 
-            try 
+            try
             {
                 // Wearables
                 SetDefaultWearables();
                 if ((data != null) && (data["wearables"] != null) && (data["wearables"]).Type == OSDType.Array)
                 {
                     OSDArray wears = (OSDArray)(data["wearables"]);
-                    for (int i = 0; i < wears.Count; i++) 
+                    for (int i = 0; i < wears.Count; i++)
                         m_wearables[i] = new AvatarWearable((OSDArray)wears[i]);
                 }
                 else
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index ddfaaed..a227338 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Framework
         {
 // DEBUG ON
             m_log.WarnFormat("[CHILDAGENTDATAUPDATE] Pack data");
-// DEBUG OFF            
+// DEBUG OFF
 
             OSDMap args = new OSDMap();
             args["message_type"] = OSD.FromString("AgentData");
@@ -456,7 +456,7 @@ namespace OpenSim.Framework
         {
 // DEBUG ON
             m_log.WarnFormat("[CHILDAGENTDATAUPDATE] Unpack data");
-// DEBUG OFF            
+// DEBUG OFF
 
             if (args.ContainsKey("region_id"))
                 UUID.TryParse(args["region_id"].AsString(), out RegionID);
@@ -616,7 +616,7 @@ namespace OpenSim.Framework
 // DEBUG ON
             else
                 m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance");
-// DEBUG OFF            
+// DEBUG OFF
 
             if ((args["controllers"] != null) && (args["controllers"]).Type == OSDType.Array)
             {
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 8ccabec..0515b16 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework
     public class MainServer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private static BaseHttpServer instance = null;
         private static Dictionary<uint, BaseHttpServer> m_Servers =
                 new Dictionary<uint, BaseHttpServer>();
@@ -64,8 +64,8 @@ namespace OpenSim.Framework
 
             m_Servers[port] = new BaseHttpServer(port);
 
-            if (ipaddr != null ) 
-                m_Servers[port].ListenIPAddress = ipaddr; 
+            if (ipaddr != null)
+                m_Servers[port].ListenIPAddress = ipaddr;
 
             m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
             m_Servers[port].Start();
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 626f7eb..59968a1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -615,7 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // UseCircuitCode handling
             if (packet.Type == PacketType.UseCircuitCode)
-            {                
+            {
                 object[] array = new object[] { buffer, packet };
 
                 if (m_asyncPacketHandling)
@@ -843,7 +843,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             m_log.DebugFormat(
                 "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 
-                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);            
+                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
         }
 
         private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 31eb319..6122cc2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 UUID itemID = UUID.Zero;
                 if (sp != null)
                 {
-                    foreach(SceneObjectGroup grp in sp.Attachments)
+                    foreach (SceneObjectGroup grp in sp.Attachments)
                     {
                         if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
                         {
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 7f482cb..2dd444d 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         {
             scene.RegisterModuleInterface<IAvatarFactory>(this);
             scene.EventManager.OnNewClient += NewClient;
-             
+
             if (config != null)
             {
                 IConfig sconfig = config.Configs["Startup"];
@@ -138,7 +138,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             return cached;
         }
-        
 
         /// <summary>
         /// Set appearance data (textureentry and slider settings) received from the client
@@ -155,9 +154,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance unable to find presence for {0}",client.AgentId);
                 return;
             }
-            
+
             bool changed = false;
-            
+
             // Process the texture entry
             if (textureEntry != null)
             {
@@ -174,7 +173,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                             });
                 }
             }
-            
+
             // Process the visual params, this may change height as well
             if (visualParams != null)
             {
@@ -185,14 +184,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         sp.SetHeight(sp.Appearance.AvatarHeight);
                 }
             }
-            
+
             // If something changed in the appearance then queue an appearance save
             if (changed)
                 QueueAppearanceSave(client.AgentId);
 
             // And always queue up an appearance update to send out
             QueueAppearanceSend(client.AgentId);
-            
+
             // Send the appearance back to the avatar
             // AvatarAppearance avp = sp.Appearance;
             // sp.ControllingClient.SendAvatarDataImmediate(sp);
@@ -216,35 +215,35 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
             return true;
         }
-        
+
         #region UpdateAppearanceTimer
 
         public void QueueAppearanceSend(UUID agentid)
         {
-//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance send for {0}",agentid);              
+//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance send for {0}", agentid);
 
             // 100 nanoseconds (ticks) we should wait
-            long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000); 
+            long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000);
             lock (m_sendqueue)
             {
                 m_sendqueue[agentid] = timestamp;
                 m_updateTimer.Start();
             }
         }
-        
+
         public void QueueAppearanceSave(UUID agentid)
         {
-//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance save for {0}",agentid);             
+//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance save for {0}", agentid);
 
             // 100 nanoseconds (ticks) we should wait
-            long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000); 
+            long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000);
             lock (m_savequeue)
             {
                 m_savequeue[agentid] = timestamp;
                 m_updateTimer.Start();
             }
         }
-        
+
         private void HandleAppearanceSend(UUID agentid)
         {
             ScenePresence sp = m_scene.GetScenePresence(agentid);
@@ -254,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 return;
             }
 
-//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: Handle appearance send for {0}", agentid);             
+//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: Handle appearance send for {0}", agentid);
 
             // Send the appearance to everyone in the scene
             sp.SendAppearanceToAllOtherAgents();
@@ -262,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             // Send the appearance back to the avatar
             // AvatarAppearance avp = sp.Appearance;
-            // sp.ControllingClient.SendAppearance(avp.Owner,avp.VisualParams,avp.Texture.GetBytes());
+            // sp.ControllingClient.SendAppearance(avp.Owner, avp.VisualParams, avp.Texture.GetBytes());
 
 /*
 //  this needs to be fixed, the flag should be on scene presence not the region module
@@ -290,11 +289,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         private void HandleAppearanceUpdateTimer(object sender, EventArgs ea)
         {
             long now = DateTime.Now.Ticks;
-            
+
             lock (m_sendqueue)
             {
-                Dictionary<UUID,long> sends = new Dictionary<UUID,long>(m_sendqueue);
-                foreach (KeyValuePair<UUID,long> kvp in sends)
+                Dictionary<UUID, long> sends = new Dictionary<UUID, long>(m_sendqueue);
+                foreach (KeyValuePair<UUID, long> kvp in sends)
                 {
                     if (kvp.Value < now)
                     {
@@ -306,8 +305,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             lock (m_savequeue)
             {
-                Dictionary<UUID,long> saves = new Dictionary<UUID,long>(m_savequeue);
-                foreach (KeyValuePair<UUID,long> kvp in saves)
+                Dictionary<UUID, long> saves = new Dictionary<UUID, long>(m_savequeue);
+                foreach (KeyValuePair<UUID, long> kvp in saves)
                 {
                     if (kvp.Value < now)
                     {
@@ -320,7 +319,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             if (m_savequeue.Count == 0 && m_sendqueue.Count == 0)
                 m_updateTimer.Stop();
         }
-        
+
         #endregion
 
         /// <summary>
@@ -336,8 +335,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
 
 //            m_log.WarnFormat("[AVATAR FACTORY MODULE]: Received request for wearables of {0}", client.AgentId);
-           
-            client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++);
+
+            client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
         }
 
         /// <summary>
@@ -353,17 +352,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing unable to find presence for {0}", client.AgentId);
                 return;
             }
-            
-//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing called for {0}",client.AgentId);
+
+//            m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing called for {0}", client.AgentId);
 
             AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance, false);
 
             foreach (AvatarWearingArgs.Wearable wear in e.NowWearing)
             {
                 if (wear.Type < AvatarWearable.MAX_WEARABLES)
-                    avatAppearance.Wearables[wear.Type].Add(wear.ItemID,UUID.Zero);
+                    avatAppearance.Wearables[wear.Type].Add(wear.ItemID, UUID.Zero);
             }
-            
+
             avatAppearance.GetAssetsFrom(sp.Appearance);
 
             // This could take awhile since it needs to pull inventory
@@ -381,11 +380,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             {
                 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 {
-                    for (int j = 0 ; j < appearance.Wearables[j].Count ; j ++ )
+                    for (int j = 0; j < appearance.Wearables[j].Count; j++)
                     {
                         if (appearance.Wearables[i][j].ItemID == UUID.Zero)
                             continue;
-                        
+
                         // Ignore ruth's assets
                         if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID)
                             continue;
@@ -399,9 +398,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         else
                         {
                             m_log.ErrorFormat(
-                                "[AVATAR FACTORY MODULE]: Can't find inventory item {0} for {1}, setting to default", 
+                                "[AVATAR FACTORY MODULE]: Can't find inventory item {0} for {1}, setting to default",
                                 appearance.Wearables[i][j].ItemID, (WearableType)i);
-                            
+
                             appearance.Wearables[i].RemoveItem(appearance.Wearables[i][j].ItemID);
                         }
                     }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b637317..cc9c445 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1270,7 +1270,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_log.DebugFormat(
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
-                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);            
+                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
         }
 
         /// <summary>
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 7a28c2b..65a02df 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
-                OSDMap map = null;                
+                OSDMap map = null;
                 try { map = OSDParser.DeserializeJson(response["LLPackedAppearance"].AsString()) as OSDMap; }
                 catch { }
 
@@ -134,7 +134,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     AvatarAppearance appearance = new AvatarAppearance(map);
 // DEBUG ON
                     m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] retrieved appearance for {0}:\n{1}",userID,appearance.ToString());
-// DEBUG OFF                    
+// DEBUG OFF
                     return appearance;
                 }
 
@@ -161,7 +161,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
 // DEBUG ON
             m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] save appearance for {0}",userID);
-// DEBUG OFF                    
+// DEBUG OFF
 
             NameValueCollection requestArgs = new NameValueCollection
                 {