diff options
author | Diva Canto | 2015-08-31 14:09:15 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-31 14:09:15 -0700 |
commit | 11194209df8a29f5103e6e34104eae7834f3280a (patch) | |
tree | 605cd55258ef11167a8bfa4c894e1e026e172919 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | All physics plugins are now region modules. Compiles but doesn't run. (diff) | |
download | opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.zip opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.gz opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.bz2 opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.xz |
First commit where physics work as region module.
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index eea0fff..d77e324 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -111,7 +111,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
111 | 111 | ||
112 | public PhysicsScene PhysicsScene | 112 | public PhysicsScene PhysicsScene |
113 | { | 113 | { |
114 | get { return _PhyScene; } | 114 | get |
115 | { | ||
116 | if (_PhyScene == null) | ||
117 | _PhyScene = m_parentScene.RequestModuleInterface<PhysicsScene>(); | ||
118 | return _PhyScene; | ||
119 | } | ||
115 | set | 120 | set |
116 | { | 121 | { |
117 | // If we're not doing the initial set | 122 | // If we're not doing the initial set |