From 58b68aa5e97bfb877676910a74d698e24ade5485 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 6 Dec 2018 19:04:51 +0000
Subject: fix compile putting back useless things until they are fully removed
---
OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
index e8d6334..db5c3f1 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
@@ -130,7 +130,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
RequestAssetMethod = m;
SetTerrain(terrain);
SetWaterLevel(waterHeight);
-
}
public virtual void TriggerPhysicsBasedRestart()
@@ -310,8 +309,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
/// </returns>
public virtual Dictionary<string, float> GetStats() { return null; }
- public abstract void GetResults();
-
public abstract void SetTerrain(float[] heightMap);
public abstract void SetWaterLevel(float baseheight);
@@ -322,8 +319,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
public abstract Dictionary<uint, float> GetTopColliders();
- public abstract bool IsThreaded { get; }
-
/// <summary>
/// True if the physics plugin supports raycasting against the physics scene
/// </summary>
@@ -409,5 +404,8 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
// A NOP if the extension thing is not implemented by the physics engine
return null;
}
+
+ public virtual void GetResults() { }
+ public virtual bool IsThreaded { get {return false;} }
}
}
--
cgit v1.1