diff options
author | Robert Adams | 2015-09-08 04:54:16 -0700 |
---|---|---|
committer | Robert Adams | 2015-09-08 04:54:16 -0700 |
commit | e5367d822be9b05e74c859afe2d2956a3e95aa33 (patch) | |
tree | e904050a30715df587aa527d7f313755177726a7 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | add lost admin_reset_land method (diff) | |
parent | Deleted access control spec from [LoginService] section of standalone config.... (diff) | |
download | opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.zip opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.gz opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.bz2 opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.xz |
Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index c9c88d3..0a22bb3 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -34,7 +34,7 @@ using OpenMetaverse.Packets; | |||
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Scenes.Types; | 36 | using OpenSim.Region.Framework.Scenes.Types; |
37 | using OpenSim.Region.Physics.Manager; | 37 | using OpenSim.Region.PhysicsModules.SharedBase; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | 39 | ||
40 | namespace OpenSim.Region.Framework.Scenes | 40 | namespace OpenSim.Region.Framework.Scenes |
@@ -121,7 +121,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
121 | 121 | ||
122 | public PhysicsScene PhysicsScene | 122 | public PhysicsScene PhysicsScene |
123 | { | 123 | { |
124 | get { return _PhyScene; } | 124 | get |
125 | { | ||
126 | if (_PhyScene == null) | ||
127 | _PhyScene = m_parentScene.RequestModuleInterface<PhysicsScene>(); | ||
128 | return _PhyScene; | ||
129 | } | ||
125 | set | 130 | set |
126 | { | 131 | { |
127 | // If we're not doing the initial set | 132 | // If we're not doing the initial set |
@@ -172,9 +177,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
172 | 177 | ||
173 | // PhysX does this (runs in the background). | 178 | // PhysX does this (runs in the background). |
174 | 179 | ||
175 | if (_PhyScene.IsThreaded) | 180 | if (PhysicsScene.IsThreaded) |
176 | { | 181 | { |
177 | _PhyScene.GetResults(); | 182 | PhysicsScene.GetResults(); |
178 | } | 183 | } |
179 | } | 184 | } |
180 | 185 | ||
@@ -214,7 +219,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
214 | // position). | 219 | // position). |
215 | // | 220 | // |
216 | // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate(). | 221 | // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate(). |
217 | return _PhyScene.Simulate((float)elapsed); | 222 | return PhysicsScene.Simulate((float)elapsed); |
218 | } | 223 | } |
219 | 224 | ||
220 | protected internal void UpdateScenePresenceMovement() | 225 | protected internal void UpdateScenePresenceMovement() |