Update svn properties. Formatting cleanup.

9 files changed, 63 insertions, 80 deletions

diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 0417269..75d5307 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -121,10 +121,14 @@ namespace OpenSim.Data
             }
 
             newversion = MaxVersion();
-            if (newversion > version) {
-                if (version == 0) {
+            if (newversion > version)
+            {
+                if (version == 0)
+                {
                     InsertVersion(_type, newversion);
-                } else {
+                }
+                else
+                {
                     UpdateVersion(_type, newversion);
                 }
             }
@@ -144,7 +148,7 @@ namespace OpenSim.Data
                 if (m.Success) 
                 {
                     int MigrationVersion = int.Parse(m.Groups[1].ToString());
-                    if ( MigrationVersion > max )
+                    if (MigrationVersion > max)
                         max = MigrationVersion;
                 }
             }
@@ -155,7 +159,8 @@ namespace OpenSim.Data
         {
             int version = 0;
             DbCommand cmd = _conn.CreateCommand();
-            try {
+            try
+            {
                 cmd.CommandText = "select version from migrations where name='" + type + "' limit 1";
                 using (IDataReader reader = cmd.ExecuteReader())
                 {
@@ -165,7 +170,9 @@ namespace OpenSim.Data
                     }
                     reader.Close();
                 }
-            } catch {
+            }
+            catch
+            {
                 // Something went wrong, so we're version 0
             }
             return version;
@@ -218,10 +225,11 @@ namespace OpenSim.Data
             }
 
             // TODO: once this is working, get rid of this
-            if (migrations.Count < 1) {
+            if (migrations.Count < 1)
+            {
                 m_log.InfoFormat("Resource '{0}' was not found", _type);
             }
             return migrations;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index c813e91..70b3d3c 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -230,13 +230,12 @@ namespace OpenSim.Framework.Console
         {
             try
             {
-                                string line = System.Console.ReadLine();
-                                while(line == null)
-                                {
-
-                                        line = System.Console.ReadLine();
-                                }
-                                        
+                string line = System.Console.ReadLine();
+                while (line == null)
+                {
+                    line = System.Console.ReadLine();
+                }
+                    
                 return line;
             }
             catch (Exception e)
@@ -364,8 +363,7 @@ namespace OpenSim.Framework.Console
         public void Prompt()
         {
             string tempstr = CmdPrompt(m_componentName + "# ");
-                        RunCommand(tempstr);
-                        
+            RunCommand(tempstr);
         }
 
         public void RunCommand(string cmdline)
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index ca3fd4b..506db31 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Statistics
     /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane
     /// </summary>
     public class SimExtraStatsCollector : IStatsCollector
-    {        
+    {
         private long abnormalClientThreadTerminations;
         
         private long assetsInCache;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b2291bc..6839896 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -738,10 +738,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
                 
                 // Don't let a failure in an individual client thread crash the whole sim.
-                m_log.ErrorFormat("[CLIENT]: Client thread for {0} {1} crashed.  Logging them out.  Exception {2}", Name, AgentId, e);                
+                m_log.ErrorFormat("[CLIENT]: Client thread for {0} {1} crashed.  Logging them out.  Exception {2}", Name, AgentId, e);
 
                 try
-                {     
+                {
                     // Make an attempt to alert the user that their session has crashed
                     AgentAlertMessagePacket packet 
                         = BuildAgentAlertPacket(
@@ -758,10 +758,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 catch (Exception e2)
                 {
                     if (e2 is ThreadAbortException)
-                        throw e2;    
+                        throw e2;
                     
                     m_log.ErrorFormat("[CLIENT]: Further exception thrown on forced session logout.  {0}", e2);
-                }                                       
+                }
             }
         }
 
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
index 2a041dd..4f4a3c3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     /// </summary>
     public class AssetsArchiver
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         /// <summary>
         /// Archive assets
@@ -99,15 +99,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                     xtw.WriteElementString("inventory-type", asset.InvType.ToString());
                     
                     xtw.WriteEndElement();
-                }                
-                
+                }
             }
             
             xtw.WriteEndElement();
             
             xtw.WriteEndDocument();
             
-            archive.AddFile("assets.xml", sw.ToString());            
+            archive.AddFile("assets.xml", sw.ToString());
         }
         
         /// <summary>
@@ -118,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         {
             // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
             //archive.AddDir("assets");
-                        
+            
             foreach (LLUUID uuid in m_assets.Keys)
             {
                 AssetBase asset = m_assets[uuid];
@@ -140,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 {
                     m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
                 }
-            }            
+            }
         }
     }
 }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
index 15a92e5..98364d3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 {
     /// <summary>
     /// Dearchives assets
-    /// </summary>    
+    /// </summary>
     public class AssetsDearchiver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// </summary>
         protected AssetCache m_cache;
         
-        public AssetsDearchiver(AssetCache cache)            
+        public AssetsDearchiver(AssetCache cache)
         {
             m_cache = cache;
         }
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 ResolveAssetData(assetFilename, data);
             }
         }
-                 
+        
         /// <summary>
         /// Add asset metadata xml
         /// </summary>
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             m_metadata = new Dictionary<string, AssetMetadata>();
             
             StringReader sr = new StringReader(xml);
-            XmlTextReader reader = new XmlTextReader(sr);   
+            XmlTextReader reader = new XmlTextReader(sr);
             
             reader.ReadStartElement("assets");
             reader.Read();
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 metadata.Name = reader.ReadElementString("name");
                 metadata.Description = reader.ReadElementString("description");
                 metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type"));
-                metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));                                                
+                metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));
                 
                 m_metadata[filename] = metadata;
                 
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         {
             foreach (string filename in m_assetDataAwaitingMetadata.Keys)
             {
-                ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]);                
+                ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]);
             }
         }
         
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 2515122..42df746 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1391,7 +1391,6 @@ namespace OpenSim.Region.Environment.Scenes
                     //    distance2 = (float)GetDistanceTo(q, iray.Origin);
                     //}
 
-
                     if (distance2 < returnresult.distance)
                     {
                         returnresult.distance = distance2;
@@ -1410,8 +1409,8 @@ namespace OpenSim.Region.Environment.Scenes
                             if (scaleComponent.y != 0) ScaleOffset = AXscale.y;
                             if (scaleComponent.z != 0) ScaleOffset = AXscale.z;
                             ScaleOffset = Math.Abs(ScaleOffset);
-                            Vector3 offset = (returnresult.normal * ScaleOffset);
-                            returnresult.ipoint = (AXpos + offset );
+                            Vector3 offset = returnresult.normal * ScaleOffset;
+                            returnresult.ipoint = AXpos + offset;
                             
                             ///pos = (intersectionpoint + offset);
                         }
@@ -1420,10 +1419,8 @@ namespace OpenSim.Region.Environment.Scenes
                             returnresult.normal = normals[i];
                         }
                         returnresult.AAfaceNormal = AAfacenormals[i];
-
                     }
                 }
-
             }
             return returnresult;
         }
@@ -1443,8 +1440,8 @@ namespace OpenSim.Region.Environment.Scenes
             //{
                 m_shape.State = (byte)AttachmentPoint;
             //}
-
         }
+
         /// <summary>
         ///
         /// </summary>
@@ -1472,7 +1469,6 @@ namespace OpenSim.Region.Environment.Scenes
             if (m_parentGroup != null)
             {
                 m_parentGroup.SetAxisRotation(axis, rotate);
-
             }
         }
 
@@ -1494,11 +1490,9 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     PhysActor.FloatOnWater = false;
                 }
-
             }
         }
 
-
         public LLVector3 GetSitTargetPositionLL()
         {
             return new LLVector3(m_sitTargetPosition.x, m_sitTargetPosition.y, m_sitTargetPosition.z);
@@ -1544,7 +1538,6 @@ namespace OpenSim.Region.Environment.Scenes
             return m_sitTargetAvatar;
         }
 
-
         public LLUUID GetRootPartUUID()
         {
             if (m_parentGroup != null)
@@ -1797,8 +1790,6 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
         {
-
-
             //m_log.Info("TSomething1:" + ((type & (ushort)ExtraParamType.Something1) == (ushort)ExtraParamType.Something1));
             //m_log.Info("TSomething2:" + ((type & (ushort)ExtraParamType.Something2) == (ushort)ExtraParamType.Something2));
             //m_log.Info("TSomething3:" + ((type & (ushort)ExtraParamType.Something3) == (ushort)ExtraParamType.Something3));
@@ -1814,7 +1805,6 @@ namespace OpenSim.Region.Environment.Scenes
             //bool IsLocked = false;
             int i = 0;
 
-
             try
             {
                 i += 46;
@@ -1858,7 +1848,6 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
 
-
             if (IsPhantom)
             {
                 AddFlag(LLObject.ObjectFlags.Phantom);
@@ -1927,6 +1916,7 @@ namespace OpenSim.Region.Environment.Scenes
             //            System.Console.WriteLine("Update:  PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
             ScheduleFullUpdate();
         }
+
         public void ScriptSetPhysicsStatus(bool UsePhysics)
         {
             if (m_parentGroup != null)
@@ -1934,6 +1924,7 @@ namespace OpenSim.Region.Environment.Scenes
                 m_parentGroup.ScriptSetPhysicsStatus(UsePhysics);
             }
         }
+
         public void ScriptSetPhantomStatus(bool Phantom)
         {
             if (m_parentGroup != null)
@@ -1941,6 +1932,7 @@ namespace OpenSim.Region.Environment.Scenes
                 m_parentGroup.ScriptSetPhantomStatus(Phantom);
             }
         }
+
         public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
         {
             if (PhysActor != null)
@@ -1965,7 +1957,6 @@ namespace OpenSim.Region.Environment.Scenes
                     /// that's not wholesome.  Had to make Scene public
                     //PhysActor = null;
 
-
                     if ((ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
                     {
                         //PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@@ -1989,7 +1980,6 @@ namespace OpenSim.Region.Environment.Scenes
                                     PhysActor.link(ParentGroup.RootPart.PhysActor);
                                 }
                             }
-
                         }
                     }
                 }
@@ -2029,7 +2019,6 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                 }
             }
-
         }
 
         #endregion
@@ -2394,7 +2383,6 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-
         public void AddFullUpdateToAvatar(ScenePresence presence)
         {
             presence.QueuePartForUpdate(this);
@@ -2454,13 +2442,11 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
 
-
             byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
-            remoteClient.SendPrimitiveToClient(
-                                               m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
-                                               lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid,
-                                               OwnerID,
-                                               m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
+            remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
+                                               lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, OwnerID,
+                                               m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment,
+                                               m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
         }
 
         /// Terse updates
@@ -2557,7 +2543,6 @@ namespace OpenSim.Region.Environment.Scenes
                     m_parentGroup.AbsolutePosition = newpos;
                     return;
                 }
-
             }
             ScheduleTerseUpdate();
 
@@ -2578,7 +2563,6 @@ namespace OpenSim.Region.Environment.Scenes
         {
         }
 
-
         public void SetText(string text)
         {
             Text = text;
@@ -2724,7 +2708,6 @@ namespace OpenSim.Region.Environment.Scenes
             info.AddValue("PayPrice", PayPrice);
         }
 
-
         public void Undo()
         {
             if (m_undo.Count > 0)
@@ -2837,10 +2820,9 @@ namespace OpenSim.Region.Environment.Scenes
             else
                 ScheduleFullUpdate();
         }
+
         public void PhysicsCollision(EventArgs e)
         {
-            //return;
-
             // single threaded here
             if (e == null)
             {
@@ -2865,7 +2847,6 @@ namespace OpenSim.Region.Environment.Scenes
                         startedColliders.Add(localid);
                     }
 
-
                     //m_log.Debug("[OBJECT]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
                 }
             }
@@ -2878,7 +2859,6 @@ namespace OpenSim.Region.Environment.Scenes
                     endedColliders.Add(localID);
                 }
             }
-            
 
             //add the items that started colliding this time to the last colliders list.
             foreach (uint localID in startedColliders)
@@ -2944,7 +2924,6 @@ namespace OpenSim.Region.Environment.Scenes
                                         colliding.Add(detobj);
                                     }
                                 }
-
                             }
                         }
                     }
@@ -2958,7 +2937,6 @@ namespace OpenSim.Region.Environment.Scenes
                             return;
                         m_parentGroup.Scene.EventManager.TriggerScriptCollidingStart(LocalId, StartCollidingMessage);
                     }
-
                 }
             }
             if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.collision) != 0)
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 4927cc5..3d9207f 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -130,11 +130,11 @@ namespace OpenSim.Region.Physics.Manager
                             IPhysicsPlugin plug =
                                 (IPhysicsPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                             plug.Init();
-                                                        if(!_PhysPlugins.ContainsKey(plug.GetName()))
-                                                        {
-                                        _PhysPlugins.Add(plug.GetName(), plug);
-                                        m_log.Info("[PHYSICS]: Added physics engine: " + plug.GetName());
-                                                        }
+                            if (!_PhysPlugins.ContainsKey(plug.GetName()))
+                            {
+                                _PhysPlugins.Add(plug.GetName(), plug);
+                                m_log.Info("[PHYSICS]: Added physics engine: " + plug.GetName());
+                            }
                         }
 
                         Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true);
@@ -143,11 +143,11 @@ namespace OpenSim.Region.Physics.Manager
                         {
                             IMeshingPlugin plug =
                                 (IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        if(!_MeshPlugins.ContainsKey(plug.GetName()))
-                                                        {
-                                        _MeshPlugins.Add(plug.GetName(), plug);
-                                        m_log.Info("[PHYSICS]: Added meshing engine: " + plug.GetName());
-                                                        }
+                            if (!_MeshPlugins.ContainsKey(plug.GetName()))
+                            {
+                                _MeshPlugins.Add(plug.GetName(), plug);
+                                m_log.Info("[PHYSICS]: Added meshing engine: " + plug.GetName());
+                            }
                         }
 
                         physTypeInterface = null;
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index c51e66b..5a3ebc7 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                 detstruct._int[i] = detobj.colliderType;
                 detstruct._Vector3[i] = new LSL_Types.Vector3(detobj.posVector.X, detobj.posVector.Y, detobj.posVector.Z);
                 detstruct._Vector32[i] = new LSL_Types.Vector3(detobj.velVector.X, detobj.velVector.Y, detobj.velVector.Z);
-                detstruct._bool[i] = true; // Apparently the script engine uses this to see if this is a valid entry...       
+                detstruct._bool[i] = true; // Apparently the script engine uses this to see if this is a valid entry...
                 i++;
             }
 
@@ -307,7 +307,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                 detstruct._int[i] = detobj.colliderType;
                 detstruct._Vector3[i] = new LSL_Types.Vector3(detobj.posVector.X, detobj.posVector.Y, detobj.posVector.Z);
                 detstruct._Vector32[i] = new LSL_Types.Vector3(detobj.velVector.X, detobj.velVector.Y, detobj.velVector.Z);
-                detstruct._bool[i] = true; // Apparently the script engine uses this to see if this is a valid entry...       
+                detstruct._bool[i] = true; // Apparently the script engine uses this to see if this is a valid entry...
                 i++;
             }
             myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "collision_end", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(col.Colliders.Count) });