aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-12 06:58:55 +0000
committerTeravus Ovares2007-12-12 06:58:55 +0000
commit081f4403ea2a2f8352d480910052bf5032e2e4a5 (patch)
tree9eeda0d127f84b1e0538ac834e7921a074b6503e /OpenSim/Region/Physics/Manager
parent* Patch from justincc to fix Inconsistent automatic mysql table creation - se... (diff)
downloadopensim-SC-081f4403ea2a2f8352d480910052bf5032e2e4a5.zip
opensim-SC-081f4403ea2a2f8352d480910052bf5032e2e4a5.tar.gz
opensim-SC-081f4403ea2a2f8352d480910052bf5032e2e4a5.tar.bz2
opensim-SC-081f4403ea2a2f8352d480910052bf5032e2e4a5.tar.xz
* Added some simstats to fill the simulator pane of the Statistics monitor.
* I stress, this is an initial implementation and the Agents(Child and Root) are definately obviously incorrect.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 71cba22..c63a66d 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Physics.Manager
70 PhysicsVector size, Quaternion rotation, bool isPhysical); 70 PhysicsVector size, Quaternion rotation, bool isPhysical);
71 public abstract void AddPhysicsActorTaint(PhysicsActor prim); 71 public abstract void AddPhysicsActorTaint(PhysicsActor prim);
72 72
73 public abstract void Simulate(float timeStep); 73 public abstract float Simulate(float timeStep);
74 74
75 public abstract void GetResults(); 75 public abstract void GetResults();
76 76
@@ -126,11 +126,12 @@ namespace OpenSim.Region.Physics.Manager
126 { 126 {
127 127
128 } 128 }
129 public override void Simulate(float timeStep) 129 public override float Simulate(float timeStep)
130 { 130 {
131 m_workIndicator = (m_workIndicator + 1)%10; 131 m_workIndicator = (m_workIndicator + 1)%10;
132 132
133 //MainLog.Instance.SetStatus(m_workIndicator.ToString()); 133 //MainLog.Instance.SetStatus(m_workIndicator.ToString());
134 return 0f;
134 } 135 }
135 136
136 public override void GetResults() 137 public override void GetResults()