21 files changed, 101 insertions, 99 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index aabd471..16bb69e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -775,4 +775,4 @@ namespace OpenSim
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 1597cc5..83b4cbc 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -382,7 +382,7 @@ namespace OpenSim.Region.ClientStack
             newSimPack.Info = new CrossedRegionPacket.InfoBlock();
             newSimPack.Info.Position = pos;
             newSimPack.Info.LookAt = look;
-                // new LLVector3(0.0f, 0.0f, 0.0f);     // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
+            // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
             newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();
             newSimPack.RegionData.RegionHandle = newRegionHandle;
             byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
@@ -847,7 +847,7 @@ namespace OpenSim.Region.ClientStack
         {
             AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
             aw.AgentData.AgentID = AgentId;
-            aw.AgentData.SerialNum = (uint)serial;
+            aw.AgentData.SerialNum = (uint) serial;
             aw.AgentData.SessionID = m_sessionId;
 
             aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
@@ -1296,7 +1296,7 @@ namespace OpenSim.Region.ClientStack
         protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
         {
             ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock();
-                //  new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
+            //  new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
 
             SetDefaultAvatarPacketValues(ref objdata);
             objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
index 2678a98..dc7952e 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ClientStack
                 else
                 {
                     m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode);
-                        //userEP);
+                    //userEP);
                 }
             }
             catch (Exception)
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 1e14587..7c1a663 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.AgentRequestSit:
                         if (OnAgentRequestSit != null)
                         {
-                            AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack;
+                            AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket) Pack;
                             OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
                                               agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
                         }
@@ -770,4 +770,4 @@ namespace OpenSim.Region.ClientStack
             OutPacket(logReply);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 730c199..0e35488 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack
             new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
 
         protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>();
-                                                       //local handlers for this instance 
+        //local handlers for this instance 
 
         private LLUUID m_sessionId;
         public LLUUID SecureSessionID = LLUUID.Zero;
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack
         {
             if (debug > 0)
             {
-                string info= "";
+                string info = "";
                 if (debug < 255 && packet.Type == PacketType.AgentUpdate)
                     return;
                 if (debug < 254 && packet.Type == PacketType.ViewerEffect)
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 3a0b47f..f78c086 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Communications.Local
                     map.Y = (ushort) regInfo.RegionLocY;
                     map.WaterHeight = (byte) regInfo.EstateSettings.waterHeight;
                     map.MapImageId = regInfo.EstateSettings.terrainImageID;
-                        //new LLUUID("00000000-0000-0000-9999-000000000007");
+                    //new LLUUID("00000000-0000-0000-9999-000000000007");
                     map.Agents = 1;
                     map.RegionFlags = 72458694;
                     map.Access = 13;
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 1281a44..5da36fc 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -46,4 +46,4 @@ namespace OpenSim.Region.Communications.OGS1
             m_userService = new OGS1UserServices(this);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 85df353..7597e79 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.IO;
-using System.Xml.Serialization;
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
@@ -38,7 +35,7 @@ namespace OpenSim.Region.Communications.OGS1
 {
     public class OGS1InventoryService : IInventoryServices
     {
-        string _inventoryServerUrl;
+        private string _inventoryServerUrl;
 
         public OGS1InventoryService(string inventoryServerUrl)
         {
@@ -88,4 +85,4 @@ namespace OpenSim.Region.Communications.OGS1
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 99b69e1..9d4187a 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -431,4 +431,4 @@ namespace OpenSim.Region.Environment.Modules
             m_tcp.Close();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 5af2ce3..7a631d7 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -490,4 +490,4 @@ namespace OpenSim.Region.Environment.Modules
             return m_id;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 73954d0..73d317a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -332,16 +332,14 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (ent is SceneObjectGroup)
                 {
-                    hasprim = ((SceneObjectGroup)ent).HasChildPrim(localID);
+                    hasprim = ((SceneObjectGroup) ent).HasChildPrim(localID);
                     if (hasprim != false)
                     {
-                        
-                        ((SceneObjectGroup)ent).UpdatePrimFlags(localID, (ushort)packet.Type, true, packet.ToBytes());
-
+                        ((SceneObjectGroup) ent).UpdatePrimFlags(localID, (ushort) packet.Type, true, packet.ToBytes());
                     }
                 }
             }
-            
+
             //System.Console.WriteLine("Got primupdate packet: " + packet.UsePhysics.ToString());
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8da22c4..d02f3e3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1565,4 +1565,4 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index aaa25e7..2f746b2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -341,8 +341,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// 
         /// </summary>
         public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos,
-                                PrimitiveBaseShape shape):this(scene, regionHandle, ownerID, localID, pos, LLQuaternion.Identity, shape)
-                {
+                                PrimitiveBaseShape shape)
+            : this(scene, regionHandle, ownerID, localID, pos, LLQuaternion.Identity, shape)
+        {
         }
 
         #endregion
@@ -927,6 +928,7 @@ namespace OpenSim.Region.Environment.Scenes
                 part.UpdatePrimFlags(type, inUse, data);
             }
         }
+
         public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data)
         {
             SceneObjectPart part = GetChildPart(localID);
@@ -1394,4 +1396,4 @@ namespace OpenSim.Region.Environment.Scenes
             Text = text;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index dacac4b..38eaf90 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -272,9 +272,10 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID,
-                               PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition):this(regionHandle, parent, ownerID, localID, shape, groupPosition, LLQuaternion.Identity, offsetPosition)
-                {
-                }
+                               PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition)
+            : this(regionHandle, parent, ownerID, localID, shape, groupPosition, LLQuaternion.Identity, offsetPosition)
+        {
+        }
 
         /// <summary>
         /// Create a completely new SceneObjectPart (prim)
@@ -286,7 +287,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="shape"></param>
         /// <param name="position"></param>
         public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID,
-                               PrimitiveBaseShape shape, LLVector3 groupPosition, LLQuaternion rotationOffset, LLVector3 offsetPosition)
+                               PrimitiveBaseShape shape, LLVector3 groupPosition, LLQuaternion rotationOffset,
+                               LLVector3 offsetPosition)
         {
             m_name = "Primitive";
             m_regionHandle = regionHandle;
@@ -313,12 +315,12 @@ namespace OpenSim.Region.Environment.Scenes
             m_flags = 0;
             m_flags |= LLObject.ObjectFlags.ObjectModify |
                        LLObject.ObjectFlags.ObjectCopy |
-                        LLObject.ObjectFlags.ObjectYouOwner |
-                        LLObject.ObjectFlags.Touch |
-                        LLObject.ObjectFlags.ObjectMove |
+                       LLObject.ObjectFlags.ObjectYouOwner |
+                       LLObject.ObjectFlags.Touch |
+                       LLObject.ObjectFlags.ObjectMove |
                        LLObject.ObjectFlags.AllowInventoryDrop |
                        LLObject.ObjectFlags.ObjectTransfer |
-                                           LLObject.ObjectFlags.CreateSelected |
+                       LLObject.ObjectFlags.CreateSelected |
                        LLObject.ObjectFlags.ObjectOwnerModify;
 
             ScheduleFullUpdate();
@@ -447,23 +449,25 @@ namespace OpenSim.Region.Environment.Scenes
             TimeStampFull = (uint) Util.UnixTimeSinceEpoch();
             m_updateFlag = 2;
         }
+
         public void AddFlag(LLObject.ObjectFlags flag)
         {
-            LLObject.ObjectFlags prevflag =  m_flags;
+            LLObject.ObjectFlags prevflag = m_flags;
             //uint objflags = m_flags;
-            if ((this.ObjectFlags & (uint)flag) == 0)
+            if ((ObjectFlags & (uint) flag) == 0)
             {
                 //Console.WriteLine("Adding flag: " + ((LLObject.ObjectFlags) flag).ToString());
                 m_flags |= flag;
             }
-            uint currflag = (uint)m_flags;
+            uint currflag = (uint) m_flags;
             //System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + m_flags.ToString());
             //ScheduleFullUpdate();
         }
+
         public void RemFlag(LLObject.ObjectFlags flag)
         {
-            LLObject.ObjectFlags prevflag  = m_flags;
-            if ((this.ObjectFlags & (uint) flag) != 0)
+            LLObject.ObjectFlags prevflag = m_flags;
+            if ((ObjectFlags & (uint) flag) != 0)
             {
                 //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString());
                 m_flags &= ~flag;
@@ -640,6 +644,7 @@ namespace OpenSim.Region.Environment.Scenes
         #endregion
 
         #region ExtraParams
+
         public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
         {
             bool hasPrim = false;
@@ -649,8 +654,8 @@ namespace OpenSim.Region.Environment.Scenes
             bool CastsShadows = false;
             //bool IsLocked = false;
             int i = 0;
-            
-            
+
+
             try
             {
                 i += 46;
@@ -661,40 +666,41 @@ namespace OpenSim.Region.Environment.Scenes
                 IsPhantom = (data[i++] != 0) ? true : false;
                 CastsShadows = (data[i++] != 0) ? true : false;
             }
-            catch (System.Exception e)
+            catch (Exception e)
             {
-                System.Console.WriteLine("Ignoring invalid Packet:");
+                Console.WriteLine("Ignoring invalid Packet:");
                 //Silently ignore it - TODO: FIXME Quick
             }
 
             if (IsPhantom)
             {
                 AddFlag(LLObject.ObjectFlags.Phantom);
-                if(this.PhysActor != null) {
-                    this.m_parentGroup.m_scene.PhysScene.RemovePrim(this.PhysActor);        /// that's not wholesome.  Had to make m_scene public
-                    this.PhysActor = null;
+                if (PhysActor != null)
+                {
+                    m_parentGroup.m_scene.PhysScene.RemovePrim(PhysActor);
+                        /// that's not wholesome.  Had to make m_scene public
+                    PhysActor = null;
                 }
             }
             else
             {
                 RemFlag(LLObject.ObjectFlags.Phantom);
-                if (this.PhysActor == null)
+                if (PhysActor == null)
                 {
-                    this.PhysActor = this.m_parentGroup.m_scene.PhysScene.AddPrimShape(
-                        this.Name,
-                        this.Shape,
-                        new PhysicsVector(this.AbsolutePosition.X, this.AbsolutePosition.Y,
-                                          this.AbsolutePosition.Z),
-                        new PhysicsVector(this.Scale.X, this.Scale.Y, this.Scale.Z),
-                        new Quaternion(this.RotationOffset.W, this.RotationOffset.X,
-                                       this.RotationOffset.Y, this.RotationOffset.Z));
+                    PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape(
+                        Name,
+                        Shape,
+                        new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y,
+                                          AbsolutePosition.Z),
+                        new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
+                        new Quaternion(RotationOffset.W, RotationOffset.X,
+                                       RotationOffset.Y, RotationOffset.Z));
                 }
             }
 
             if (UsePhysics)
             {
                 AddFlag(LLObject.ObjectFlags.Physics);
-
             }
             else
             {
@@ -710,9 +716,6 @@ namespace OpenSim.Region.Environment.Scenes
             }
 //            System.Console.WriteLine("Update:  PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
             ScheduleFullUpdate();
-
-
-
         }
 
         public void UpdateExtraParam(ushort type, bool inUse, byte[] data)
@@ -861,22 +864,21 @@ namespace OpenSim.Region.Environment.Scenes
         {
             LLQuaternion lRot;
             lRot = RotationOffset;
-                        uint clientFlags = ObjectFlags & ~(uint)LLObject.ObjectFlags.CreateSelected;
-
-                        List<ScenePresence> avatars=m_parentGroup.GetScenePresences();
-                        foreach(ScenePresence s in avatars)
-                        {
-                                if(s.m_uuid == OwnerID)
-                                {
-                                        if(s.ControllingClient == remoteClient)
-                                        {
-                                                clientFlags = ObjectFlags;
-                                                m_flags &= ~LLObject.ObjectFlags.CreateSelected;
-
-                                        }
-                                        break;
-                                }
-                        }
+            uint clientFlags = ObjectFlags & ~(uint) LLObject.ObjectFlags.CreateSelected;
+
+            List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
+            foreach (ScenePresence s in avatars)
+            {
+                if (s.m_uuid == OwnerID)
+                {
+                    if (s.ControllingClient == remoteClient)
+                    {
+                        clientFlags = ObjectFlags;
+                        m_flags &= ~LLObject.ObjectFlags.CreateSelected;
+                    }
+                    break;
+                }
+            }
 
             remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, clientFlags, m_uuid,
                                                OwnerID,
@@ -1042,4 +1044,4 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 763be03..f2d0219 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -455,7 +455,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             // Must check for standing up even when PhysicsActor is null,
             // since sitting currently removes avatar from physical scene
-            if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
+            if ((flags & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
             {
                 StandUp();
                 UpdateMovementAnimations(true);
@@ -526,7 +526,8 @@ namespace OpenSim.Region.Environment.Scenes
                 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
                 LLVector3 pos = new LLVector3();
                 if (part != null)
-                    pos = part.AbsolutePosition + m_requestedSitOffset + new LLVector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
+                    pos = part.AbsolutePosition + m_requestedSitOffset +
+                          new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
                 MakeRootAgent(pos, false);
                 m_parentID = 0;
                 SendFullUpdateToAllClients();
@@ -569,7 +570,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             remoteClient.OutPacket(avatarSitResponse);
         }
-            
+
         public void HandleAgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID, LLVector3 offset)
         {
             SendSitResponse(remoteClient, targetID, offset);
@@ -597,7 +598,8 @@ namespace OpenSim.Region.Environment.Scenes
         {
             // these magic numbers come mostly from experimenting with ODE,
             // and seeing what looks right
-            AbsolutePosition = m_requestedSitOffset + new LLVector3(m_physicsActor.Size.X / 2.7f, 0f, m_physicsActor.Size.Z / 1.45f);
+            AbsolutePosition = m_requestedSitOffset +
+                               new LLVector3(m_physicsActor.Size.X/2.7f, 0f, m_physicsActor.Size.Z/1.45f);
             m_parentID = m_requestedSitTargetID;
             MakeChildAgent();
             SendAnimPack(Animations.AnimsLLUUID["SIT"], 1);
@@ -616,20 +618,21 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                     else
                     {
-                        if (((m_movementflag & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && PhysicsActor.IsColliding)
+                        if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) &&
+                            PhysicsActor.IsColliding)
                         {
                             SendAnimPack(Animations.AnimsLLUUID["CROUCHWALK"], 1);
                         }
                         else
-                        {   
-                            SendAnimPack(Animations.AnimsLLUUID["WALK"], 1);  
+                        {
+                            SendAnimPack(Animations.AnimsLLUUID["WALK"], 1);
                         }
-                        
                     }
                 }
                 else
                 {
-                    if (((m_movementflag & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && PhysicsActor.IsColliding)
+                    if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) &&
+                        PhysicsActor.IsColliding)
                     {
                         SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1);
                     }
@@ -656,7 +659,9 @@ namespace OpenSim.Region.Environment.Scenes
 
             direc = direc*((0.03f)*128f);
             if (m_physicsActor.Flying)
-            { direc *= 4; }
+            {
+                direc *= 4;
+            }
             else
             {
                 if (!m_physicsActor.Flying && m_physicsActor.IsColliding)
@@ -668,7 +673,6 @@ namespace OpenSim.Region.Environment.Scenes
                         //System.Console.WriteLine("Jump");
                         SendAnimPack(Animations.AnimsLLUUID["PRE_JUMP"], 1);
                     }
-
                 }
             }
 
@@ -1093,4 +1097,4 @@ namespace OpenSim.Region.Environment.Scenes
             m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
index 41dc567..dc93b89 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
@@ -27,12 +27,10 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
 {
     public class BaseType : Object
     {
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 2778e9c..8cd94c3 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
             foreach (KeyValuePair<string, IScript> script in compiledscripts)
             {
                 ScriptInfo scriptInfo = new ScriptInfo(m_scene);
-                    // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
+                // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
                 MainLog.Instance.Verbose("Loading " + script.Key);
                 script.Value.Initialise(scriptInfo);
                 scripts.Add(script.Value);
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
         {
             MainLog.Instance.Verbose("Loading script " + script.Name);
             ScriptInfo scriptInfo = new ScriptInfo(m_scene);
-                // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
+            // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
             script.Initialise(scriptInfo);
             scripts.Add(script);
 
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index c516044..f26b9a1 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -246,4 +246,4 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 74608ef..f1d0f84 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Physics.Manager
         public abstract Quaternion Orientation { get; set; }
 
         public abstract bool Flying { get; set; }
-  
+
         public abstract bool IsColliding { get; set; }
 
         public abstract bool Kinematic { get; set; }
@@ -105,6 +105,7 @@ namespace OpenSim.Region.Physics.Manager
             get { return false; }
             set { return; }
         }
+
         public override bool IsColliding
         {
             get { return false; }
@@ -127,4 +128,4 @@ namespace OpenSim.Region.Physics.Manager
             return;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
index 4cb70c2..9bc6380 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
@@ -26,7 +26,7 @@
 * 
 */
 
- /*  Channel
+/*  Channel
  *  A channel is a single heightmap array
  * */
 
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
index 0ca3d48..72727d1 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
@@ -47,7 +47,7 @@ namespace libTerrain
             thisFrame = (double[,]) map.Clone();
 
             NeighbourSystem type = NeighbourSystem.Moore;
-                // Using moore neighbourhood (twice as computationally expensive)
+            // Using moore neighbourhood (twice as computationally expensive)
             int NEIGHBOUR_ME = 4; // I am always 4 in both systems.
 
             int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;