ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

First commit where physics work as region module.

Browse Source 
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
This commit is contained in:
Diva Canto
2015-08-31 14:09:15 -07:00
parent 134d4300f0
commit 11194209df
17 changed files with 91 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -850,10 +850,10 @@ namespace OpenSim.Region.Framework.Scenes
#region Constructors
public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
public Scene(RegionInfo regInfo, AgentCircuitManager authen,
ISimulationDataService simDataService, IEstateDataService estateDataService,
IConfigSource config, string simulatorVersion)
: this(regInfo, physicsScene)
: this(regInfo)
{
m_config = config;
MinFrameTicks = 89;
@@ -1192,11 +1192,10 @@ namespace OpenSim.Region.Framework.Scenes
}
public Scene(RegionInfo regInfo, PhysicsScene physicsScene)
public Scene(RegionInfo regInfo)
: base(regInfo)
{
m_sceneGraph = new SceneGraph(this);
m_sceneGraph.PhysicsScene = physicsScene;
// If the scene graph has an Unrecoverable error, restart this sim.
// Currently the only thing that causes it to happen is two kinds of specific

7
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -111,7 +111,12 @@ namespace OpenSim.Region.Framework.Scenes
public PhysicsScene PhysicsScene
{
get { return _PhyScene; }
get
{
if (_PhyScene == null)
_PhyScene = m_parentScene.RequestModuleInterface<PhysicsScene>();
return _PhyScene;
}
set
{
// If we're not doing the initial set