ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

now break several things at same time... sog/sop updates, threads options,...

Browse Source
This commit is contained in:
UbitUmarov
2018-12-28 13:52:59 +00:00
parent 0cf5876c45
commit 4a73cc81dc
25 changed files with 548 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
View File

@@ -229,16 +229,6 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
return fps;
}
public override void GetResults()
{
}
public override bool IsThreaded
{
get { return (false); // for now we won't be multithreaded
}
}
public override void SetTerrain(float[] heightMap)
{
_heightMap = heightMap;

12
OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
View File

@@ -352,13 +352,9 @@ namespace OpenSim.Region.PhysicsModule.BulletS
if (BSParam.UseSeparatePhysicsThread)
{
// The physics simulation should happen independently of the heartbeat loop
m_physicsThread
= WorkManager.StartThread(
m_physicsThread = WorkManager.StartThread(
BulletSPluginPhysicsThread,
string.Format("{0} ({1})", BulletEngineName, RegionName),
ThreadPriority.Normal,
true,
true);
string.Format("{0} ({1})", BulletEngineName, RegionName));
}
}
@@ -942,8 +938,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
#endregion // Simulation
public override void GetResults() { }
#region Terrain
public override void SetTerrain(float[] heightMap) {
@@ -1124,8 +1118,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
return topColliders;
}
public override bool IsThreaded { get { return false; } }
#region Extensions
public override object Extension(string pFunct, params object[] pParams)
{

10
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
View File

@@ -3204,16 +3204,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
}
}
public override void GetResults()
{
}
public override bool IsThreaded
{
// for now we won't be multithreaded
get { return false; }
}
public override void SetTerrain(float[] heightMap)
{
if (m_worldOffset != Vector3.Zero && m_parentScene != null)

10
OpenSim/Region/PhysicsModules/POS/POSScene.cs
View File

@@ -297,16 +297,6 @@ namespace OpenSim.Region.PhysicsModule.POS
return 1.0f;
}
public override void GetResults()
{
}
public override bool IsThreaded
{
// for now we won't be multithreaded
get { return (false); }
}
public override void SetTerrain(float[] heightMap)
{
_heightMap = heightMap;

10
OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
View File

@@ -85,11 +85,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
return 0f;
}
public override void GetResults()
{
m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()");
}
public override void SetTerrain(float[] heightMap)
{
m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
@@ -99,11 +94,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
{
}
public override bool IsThreaded
{
get { return false; }
}
public override void Dispose()
{
}