aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs16
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 37481f1..bd2ad99 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,6 +25,7 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
28using Axiom.Math; 29using Axiom.Math;
29using OpenSim.Framework; 30using OpenSim.Framework;
30using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
@@ -35,6 +36,8 @@ namespace OpenSim.Region.Physics.Manager
35 36
36 public abstract class PhysicsScene 37 public abstract class PhysicsScene
37 { 38 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
40
38 // The only thing that should register for this event is the InnerScene 41 // The only thing that should register for this event is the InnerScene
39 // Anything else could cause problems. 42 // Anything else could cause problems.
40 43
@@ -92,7 +95,7 @@ namespace OpenSim.Region.Physics.Manager
92 95
93 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
94 { 97 {
95 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddAvatar({0})", position); 98 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position));
96 return PhysicsActor.Null; 99 return PhysicsActor.Null;
97 } 100 }
98 101
@@ -107,7 +110,7 @@ namespace OpenSim.Region.Physics.Manager
107/* 110/*
108 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 111 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
109 { 112 {
110 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); 113 m_log.Info(String.Format("NullPhysicsScene : AddPrim({0},{1})", position, size));
111 return PhysicsActor.Null; 114 return PhysicsActor.Null;
112 } 115 }
113*/ 116*/
@@ -121,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
121 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, 124 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
122 PhysicsVector size, Quaternion rotation, bool isPhysical) 125 PhysicsVector size, Quaternion rotation, bool isPhysical)
123 { 126 {
124 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size); 127 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size));
125 return PhysicsActor.Null; 128 return PhysicsActor.Null;
126 } 129 }
127 130
@@ -131,20 +134,19 @@ namespace OpenSim.Region.Physics.Manager
131 134
132 public override float Simulate(float timeStep) 135 public override float Simulate(float timeStep)
133 { 136 {
134 m_workIndicator = (m_workIndicator + 1)%10; 137 m_workIndicator = (m_workIndicator + 1) % 10;
135 138
136 //MainLog.Instance.SetStatus(m_workIndicator.ToString());
137 return 0f; 139 return 0f;
138 } 140 }
139 141
140 public override void GetResults() 142 public override void GetResults()
141 { 143 {
142 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : GetResults()"); 144 m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()");
143 } 145 }
144 146
145 public override void SetTerrain(float[] heightMap) 147 public override void SetTerrain(float[] heightMap)
146 { 148 {
147 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 149 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length));
148 } 150 }
149 151
150 public override void DeleteTerrain() 152 public override void DeleteTerrain()