5 files changed, 503 insertions, 503 deletions
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 9415db9..27b467f 100644
--- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
@@ -1,56 +1,56 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System.Reflection;
+using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
-// Information about this assembly is defined by the following
+// Information about this assembly is defined by the following
-// attributes.
+// attributes.
-//
+//
-// change them to the information which is associated with the assembly
+// change them to the information which is associated with the assembly
-// you compile.
+// you compile.
-[assembly: AssemblyTitle("PhysicsManager")]
+[assembly: AssemblyTitle("PhysicsManager")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PhysicsManager")]
+[assembly: AssemblyProduct("PhysicsManager")]
-[assembly: AssemblyCopyright("")]
+[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("")]
-// This sets the default COM visibility of types in the assembly to invisible.
+// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
-// The assembly version has following format :
+// The assembly version has following format :
-//
+//
-// Major.Minor.Build.Revision
+// Major.Minor.Build.Revision
-//
+//
-// You can specify all values by your own or you can build default build and revision
+// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
+// numbers with the '*' character (the default):
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index da3b560..2c2c8dd 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -1,167 +1,167 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using Axiom.Math;
+using Axiom.Math;
-namespace OpenSim.Physics.Manager
+namespace OpenSim.Physics.Manager
-{
+{
-    public delegate void PositionUpdate(PhysicsVector position);
+    public delegate void PositionUpdate(PhysicsVector position);
-    public delegate void VelocityUpdate(PhysicsVector velocity);
+    public delegate void VelocityUpdate(PhysicsVector velocity);
-    public delegate void OrientationUpdate(Quaternion orientation);
+    public delegate void OrientationUpdate(Quaternion orientation);
-    public abstract class PhysicsActor
+    public abstract class PhysicsActor
-    {
+    {
-        public event PositionUpdate OnPositionUpdate;
+        public event PositionUpdate OnPositionUpdate;
-        public event VelocityUpdate OnVelocityUpdate;
+        public event VelocityUpdate OnVelocityUpdate;
-        public event OrientationUpdate OnOrientationUpdate;
+        public event OrientationUpdate OnOrientationUpdate;
-        public static PhysicsActor Null
+        public static PhysicsActor Null
-        {
+        {
-            get
+            get
-            {
+            {
-                return new NullPhysicsActor();
+                return new NullPhysicsActor();
-            }
+            }
-        }
+        }
-        public abstract PhysicsVector Position
+        public abstract PhysicsVector Position
-        {
+        {
-            get;
+            get;
-            set;
+            set;
-        }
+        }
-        public abstract PhysicsVector Velocity
+        public abstract PhysicsVector Velocity
-        {
+        {
-            get;
+            get;
-            set;
+            set;
-        }
+        }
-        public abstract PhysicsVector Acceleration
+        public abstract PhysicsVector Acceleration
-        {
+        {
-            get;
+            get;
-        }
+        }
-        public abstract Quaternion Orientation
+        public abstract Quaternion Orientation
-        {
+        {
-            get;
+            get;
-            set;
+            set;
-        }
+        }
-        public abstract bool Flying
+        public abstract bool Flying
-        {
+        {
-            get;
+            get;
-            set;
+            set;
-        }
+        }
-        public abstract bool Kinematic
+        public abstract bool Kinematic
-        {
+        {
-            get;
+            get;
-            set;
+            set;
-        }
+        }
-        public abstract void AddForce(PhysicsVector force);
+        public abstract void AddForce(PhysicsVector force);
-        public abstract void SetMomentum(PhysicsVector momentum);
+        public abstract void SetMomentum(PhysicsVector momentum);
-    }
+    }
-    public class NullPhysicsActor : PhysicsActor
+    public class NullPhysicsActor : PhysicsActor
-    {
+    {
-        public override PhysicsVector Position
+        public override PhysicsVector Position
-        {
+        {
-            get
+            get
-            {
+            {
-                return PhysicsVector.Zero;
+                return PhysicsVector.Zero;
-            }
+            }
-            set
+            set
-            {
+            {
-                return;
+                return;
-            }
+            }
-        }
+        }
-        public override PhysicsVector Velocity
+        public override PhysicsVector Velocity
-        {
+        {
-            get
+            get
-            {
+            {
-                return PhysicsVector.Zero;
+                return PhysicsVector.Zero;
-            }
+            }
-            set
+            set
-            {
+            {
-                return;
+                return;
-            }
+            }
-        }
+        }
-        public override Quaternion Orientation
+        public override Quaternion Orientation
-        {
+        {
-            get
+            get
-            {
+            {
-                return Quaternion.Identity;
+                return Quaternion.Identity;
-            }
+            }
-            set
+            set
-            {
+            {
-            }
+            }
-        }
+        }
-        public override PhysicsVector Acceleration
+        public override PhysicsVector Acceleration
-        {
+        {
-            get { return PhysicsVector.Zero; }
+            get { return PhysicsVector.Zero; }
-        }
+        }
-        public override bool Flying
+        public override bool Flying
-        {
+        {
-            get
+            get
-            {
+            {
-                return false;
+                return false;
-            }
+            }
-            set
+            set
-            {
+            {
-                return;
+                return;
-            }
+            }
-        }
+        }
-        public override bool Kinematic
+        public override bool Kinematic
-        {
+        {
-            get
+            get
-            {
+            {
-                return true;
+                return true;
-            }
+            }
-            set
+            set
-            {
+            {
-                return;
+                return;
-            }
+            }
-        }
+        }
-        public override void AddForce(PhysicsVector force)
+        public override void AddForce(PhysicsVector force)
-        {
+        {
-            return;
+            return;
-        }
+        }
-        public override void SetMomentum(PhysicsVector momentum)
+        public override void SetMomentum(PhysicsVector momentum)
-        {
+        {
-            return;
+            return;
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index 265bce6..7c475e7 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -1,115 +1,115 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using OpenSim.Framework.Console;
+using OpenSim.Framework.Console;
-namespace OpenSim.Physics.Manager
+namespace OpenSim.Physics.Manager
-{
+{
-        /// <summary>
+        /// <summary>
-        /// Description of MyClass.
+        /// Description of MyClass.
-        /// </summary>
+        /// </summary>
-        public class PhysicsManager
+        public class PhysicsManager
-        {
+        {
-                private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
+                private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
-                
+                
-                public PhysicsManager()
+                public PhysicsManager()
-                {
+                {
-                        
+                        
-                }
+                }
-                
+                
-                public PhysicsScene GetPhysicsScene(string engineName)
+                public PhysicsScene GetPhysicsScene(string engineName)
-                {
+                {
-            if (String.IsNullOrEmpty(engineName))
+            if (String.IsNullOrEmpty(engineName))
-            {
+            {
-                return PhysicsScene.Null;
+                return PhysicsScene.Null;
-            }
+            }
-                        if(_plugins.ContainsKey(engineName))
+                        if(_plugins.ContainsKey(engineName))
-                        {
+                        {
-                                MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
+                                MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
-                                return _plugins[engineName].GetScene();
+                                return _plugins[engineName].GetScene();
-                        }
+                        }
-                        else
+                        else
-            {
+            {
-                MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
+                MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
-                throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
+                throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
-                        }
+                        }
-                }
+                }
-                
+                
-                public void LoadPlugins()
+                public void LoadPlugins()
-                {
+                {
-                        string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
+                        string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
-                string[] pluginFiles = Directory.GetFiles(path, "*.dll");
+                string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-        
+        
-                for(int i= 0; i<pluginFiles.Length; i++)
+                for(int i= 0; i<pluginFiles.Length; i++)
-                {
+                {
-                        this.AddPlugin(pluginFiles[i]);
+                        this.AddPlugin(pluginFiles[i]);
-                }
+                }
-        }
+        }
-                
+                
-                private void AddPlugin(string FileName)
+                private void AddPlugin(string FileName)
-                {
+                {
-                        Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+                        Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-                        
+                        
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
+                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
+                        {
-                                if (pluginType.IsPublic) 
+                                if (pluginType.IsPublic) 
-                                {
+                                {
-                                        if (!pluginType.IsAbstract)  
+                                        if (!pluginType.IsAbstract)  
-                                        {
+                                        {
-                                                Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
+                                                Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
-                                                
+                                                
-                                                if (typeInterface != null)
+                                                if (typeInterface != null)
-                                                {
+                                                {
-                                                        IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                                                        IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        plug.Init();
+                                                        plug.Init();
-                                                        this._plugins.Add(plug.GetName(),plug);
+                                                        this._plugins.Add(plug.GetName(),plug);
-                                                        
+                                                        
-                                                }       
+                                                }       
-                                                
+                                                
-                                                typeInterface = null;                   
+                                                typeInterface = null;                   
-                                        }                               
+                                        }                               
-                                }                       
+                                }                       
-                        }
+                        }
-                        
+                        
-                        pluginAssembly = null; 
+                        pluginAssembly = null; 
-                }
+                }
-        }
+        }
-        public interface IPhysicsPlugin
+        public interface IPhysicsPlugin
-        {
+        {
-                bool Init();
+                bool Init();
-                PhysicsScene GetScene();
+                PhysicsScene GetScene();
-                string GetName();
+                string GetName();
-                void Dispose();
+                void Dispose();
-        }
+        }
-}
+}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index d44da00..fb6358a 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -1,110 +1,110 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using OpenSim.Framework.Console;
+using OpenSim.Framework.Console;
-namespace OpenSim.Physics.Manager
+namespace OpenSim.Physics.Manager
-{
+{
-    public abstract class PhysicsScene
+    public abstract class PhysicsScene
-    {
+    {
-        public static PhysicsScene Null
+        public static PhysicsScene Null
-        {
+        {
-            get
+            get
-            {
+            {
-                return new NullPhysicsScene();
+                return new NullPhysicsScene();
-            }
+            }
-        }
+        }
-        public abstract PhysicsActor AddAvatar(PhysicsVector position);
+        public abstract PhysicsActor AddAvatar(PhysicsVector position);
-        public abstract void RemoveAvatar(PhysicsActor actor);
+        public abstract void RemoveAvatar(PhysicsActor actor);
-        public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
+        public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
-        public abstract void Simulate(float timeStep);
+        public abstract void Simulate(float timeStep);
-        public abstract void GetResults();
+        public abstract void GetResults();
-        public abstract void SetTerrain(float[] heightMap);
+        public abstract void SetTerrain(float[] heightMap);
-        public abstract void DeleteTerrain();
+        public abstract void DeleteTerrain();
-        public abstract bool IsThreaded
+        public abstract bool IsThreaded
-        {
+        {
-            get;
+            get;
-        }
+        }
-        private class NullPhysicsScene : PhysicsScene
+        private class NullPhysicsScene : PhysicsScene
-        {
+        {
-            private static int m_workIndicator;
+            private static int m_workIndicator;
-            public override PhysicsActor AddAvatar(PhysicsVector position)
+            public override PhysicsActor AddAvatar(PhysicsVector position)
-            {
+            {
-                MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
+                MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
-                return PhysicsActor.Null;
+                return PhysicsActor.Null;
-            }
+            }
-            public override void RemoveAvatar(PhysicsActor actor)
+            public override void RemoveAvatar(PhysicsActor actor)
-            {
+            {
-            }
+            }
-            public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+            public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-            {
+            {
-                MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
+                MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
-                return PhysicsActor.Null;
+                return PhysicsActor.Null;
-            }
+            }
-            public override void Simulate(float timeStep)
+            public override void Simulate(float timeStep)
-            {
+            {
-                m_workIndicator = (m_workIndicator + 1) % 10;
+                m_workIndicator = (m_workIndicator + 1) % 10;
-                //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
+                //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
-            }
+            }
-            public override void GetResults()
+            public override void GetResults()
-            {
+            {
-                MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
+                MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
-            }
+            }
-            public override void SetTerrain(float[] heightMap)
+            public override void SetTerrain(float[] heightMap)
-            {
+            {
-                MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
+                MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
-            }
+            }
-            public override void DeleteTerrain()
+            public override void DeleteTerrain()
-            {
+            {
-            }
+            }
-            public override bool IsThreaded
+            public override bool IsThreaded
-            {
+            {
-                get { return false; }
+                get { return false; }
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
index e75f29b..2cbca25 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsVector.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
@@ -1,55 +1,55 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-namespace OpenSim.Physics.Manager
+namespace OpenSim.Physics.Manager
-{
+{
-    public class PhysicsVector
+    public class PhysicsVector
-    {
+    {
-        public float X;
+        public float X;
-        public float Y;
+        public float Y;
-        public float Z;
+        public float Z;
-        public PhysicsVector()
+        public PhysicsVector()
-        {
+        {
-        }
+        }
-        public PhysicsVector(float x, float y, float z)
+        public PhysicsVector(float x, float y, float z)
-        {
+        {
-            X = x;
+            X = x;
-            Y = y;
+            Y = y;
-            Z = z;
+            Z = z;
-        }
+        }
-        public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f);
+        public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f);
-        public override string ToString()
+        public override string ToString()
-        {
+        {
-            return "<" + this.X + "," + this.Y + "," + this.Z + ">";
+            return "<" + this.X + "," + this.Y + "," + this.Z + ">";
-        }
+        }
-    }
+    }
-}
+}