changed to native line ending encoding

1 files changed, 110 insertions, 110 deletions

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/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* 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

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using OpenSim.Framework.Console;

-

-namespace OpenSim.Physics.Manager

-{

-    public abstract class PhysicsScene

-    {

-        public static PhysicsScene Null

-        {

-            get

-            {

-                return new NullPhysicsScene();

-            }

-        }

-

-        public abstract PhysicsActor AddAvatar(PhysicsVector position);

-

-        public abstract void RemoveAvatar(PhysicsActor actor);

-

-        public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);

-

-        public abstract void Simulate(float timeStep);

-

-        public abstract void GetResults();

-

-        public abstract void SetTerrain(float[] heightMap);

-

-        public abstract void DeleteTerrain();

-

-        public abstract bool IsThreaded

-        {

-            get;

-        }

-

-        private class NullPhysicsScene : PhysicsScene

-        {

-            private static int m_workIndicator;

-

-            public override PhysicsActor AddAvatar(PhysicsVector position)

-            {

-                MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);

-                return PhysicsActor.Null;

-            }

-

-            public override void RemoveAvatar(PhysicsActor actor)

-            {

-

-            }

-

-            public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)

-            {

-                MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);

-                return PhysicsActor.Null;

-            }

-

-            public override void Simulate(float timeStep)

-            {

-                m_workIndicator = (m_workIndicator + 1) % 10;

-

-                //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());

-            }

-

-            public override void GetResults()

-            {

-                MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");

-            }

-

-            public override void SetTerrain(float[] heightMap)

-            {

-                MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);

-            }

-

-            public override void DeleteTerrain()

-            {

-

-            }

-

-            public override bool IsThreaded

-            {

-                get { return false; }

-            }

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Physics.Manager
+{
+    public abstract class PhysicsScene
+    {
+        public static PhysicsScene Null
+        {
+            get
+            {
+                return new NullPhysicsScene();
+            }
+        }
+
+        public abstract PhysicsActor AddAvatar(PhysicsVector position);
+
+        public abstract void RemoveAvatar(PhysicsActor actor);
+
+        public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
+
+        public abstract void Simulate(float timeStep);
+
+        public abstract void GetResults();
+
+        public abstract void SetTerrain(float[] heightMap);
+
+        public abstract void DeleteTerrain();
+
+        public abstract bool IsThreaded
+        {
+            get;
+        }
+
+        private class NullPhysicsScene : PhysicsScene
+        {
+            private static int m_workIndicator;
+
+            public override PhysicsActor AddAvatar(PhysicsVector position)
+            {
+                MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
+                return PhysicsActor.Null;
+            }
+
+            public override void RemoveAvatar(PhysicsActor actor)
+            {
+
+            }
+
+            public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+            {
+                MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
+                return PhysicsActor.Null;
+            }
+
+            public override void Simulate(float timeStep)
+            {
+                m_workIndicator = (m_workIndicator + 1) % 10;
+
+                //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
+            }
+
+            public override void GetResults()
+            {
+                MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
+            }
+
+            public override void SetTerrain(float[] heightMap)
+            {
+                MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
+            }
+
+            public override void DeleteTerrain()
+            {
+
+            }
+
+            public override bool IsThreaded
+            {
+                get { return false; }
+            }
+        }
+    }
+}