aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Physics/Manager
diff options
context:
space:
mode:
authorMW2007-03-28 13:08:27 +0000
committerMW2007-03-28 13:08:27 +0000
commit98d81485e724b26d9ad35b9b7cd24c98808b9a81 (patch)
treee806f29235952264161fd33aab652937e84b1870 /OpenSim.Physics/Manager
parent* And lo, the OpenSim (which is actually the RegionServer) is decoupled from ... (diff)
downloadopensim-SC_OLD-98d81485e724b26d9ad35b9b7cd24c98808b9a81.zip
opensim-SC_OLD-98d81485e724b26d9ad35b9b7cd24c98808b9a81.tar.gz
opensim-SC_OLD-98d81485e724b26d9ad35b9b7cd24c98808b9a81.tar.bz2
opensim-SC_OLD-98d81485e724b26d9ad35b9b7cd24c98808b9a81.tar.xz
RIP OpenSimRoot. (removed)
Merged most of the bug fixes etc in from LLdemo branch. Added the textures from that branch.
Diffstat (limited to 'OpenSim.Physics/Manager')
-rw-r--r--OpenSim.Physics/Manager/PhysicsScene.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim.Physics/Manager/PhysicsScene.cs
index 632b9cd..0b3dfd2 100644
--- a/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim.Physics/Manager/PhysicsScene.cs
@@ -50,6 +50,8 @@ namespace OpenSim.Physics.Manager
50 public abstract void GetResults(); 50 public abstract void GetResults();
51 51
52 public abstract void SetTerrain(float[] heightMap); 52 public abstract void SetTerrain(float[] heightMap);
53
54 public abstract void DeleteTerrain();
53 55
54 public abstract bool IsThreaded 56 public abstract bool IsThreaded
55 { 57 {
@@ -76,6 +78,8 @@ namespace OpenSim.Physics.Manager
76 public override void Simulate(float timeStep) 78 public override void Simulate(float timeStep)
77 { 79 {
78 m_workIndicator = (m_workIndicator + 1) % 10; 80 m_workIndicator = (m_workIndicator + 1) % 10;
81
82 //OpenSim.Framework.Console.MainConsole.Instance.SetStatus(m_workIndicator.ToString());
79 } 83 }
80 84
81 public override void GetResults() 85 public override void GetResults()
@@ -88,6 +92,11 @@ namespace OpenSim.Physics.Manager
88 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
89 } 93 }
90 94
95 public override void DeleteTerrain()
96 {
97
98 }
99
91 public override bool IsThreaded 100 public override bool IsThreaded
92 { 101 {
93 get { return false; } 102 get { return false; }