diff options
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 09a0a6b..900e715 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -850,10 +850,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
850 | 850 | ||
851 | #region Constructors | 851 | #region Constructors |
852 | 852 | ||
853 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, | 853 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, |
854 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 854 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
855 | IConfigSource config, string simulatorVersion) | 855 | IConfigSource config, string simulatorVersion) |
856 | : this(regInfo, physicsScene) | 856 | : this(regInfo) |
857 | { | 857 | { |
858 | m_config = config; | 858 | m_config = config; |
859 | MinFrameTicks = 89; | 859 | MinFrameTicks = 89; |
@@ -1192,11 +1192,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1192 | 1192 | ||
1193 | } | 1193 | } |
1194 | 1194 | ||
1195 | public Scene(RegionInfo regInfo, PhysicsScene physicsScene) | 1195 | public Scene(RegionInfo regInfo) |
1196 | : base(regInfo) | 1196 | : base(regInfo) |
1197 | { | 1197 | { |
1198 | m_sceneGraph = new SceneGraph(this); | 1198 | m_sceneGraph = new SceneGraph(this); |
1199 | m_sceneGraph.PhysicsScene = physicsScene; | ||
1200 | 1199 | ||
1201 | // If the scene graph has an Unrecoverable error, restart this sim. | 1200 | // If the scene graph has an Unrecoverable error, restart this sim. |
1202 | // Currently the only thing that causes it to happen is two kinds of specific | 1201 | // Currently the only thing that causes it to happen is two kinds of specific |