aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-08-19 11:04:28 +0100
committerUbitUmarov2015-08-19 11:04:28 +0100
commit0af2fafddf36009ffe470da106dc6d0ceb3ced10 (patch)
treec5d2a58398fcc4bd1b4722a8379ce9bb643fe8e5 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'mbworkvar2' into ubitvar (diff)
downloadopensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.zip
opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.gz
opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.bz2
opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.xz
add missing regionExtent setup and Scene physicsscene configuration ( not
exactly as core)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 46c9048..fa5d021 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -760,7 +760,7 @@ namespace OpenSim.Region.Framework.Scenes
760 760
761 #region Constructors 761 #region Constructors
762 762
763 public Scene(RegionInfo regInfo, AgentCircuitManager authen, 763 public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
764 SceneCommunicationService sceneGridService, 764 SceneCommunicationService sceneGridService,
765 ISimulationDataService simDataService, IEstateDataService estateDataService, 765 ISimulationDataService simDataService, IEstateDataService estateDataService,
766 IConfigSource config, string simulatorVersion) 766 IConfigSource config, string simulatorVersion)
@@ -840,6 +840,7 @@ namespace OpenSim.Region.Framework.Scenes
840 new EventManager.LandObjectRemoved(simDataService.RemoveLandObject); 840 new EventManager.LandObjectRemoved(simDataService.RemoveLandObject);
841 841
842 m_sceneGraph = new SceneGraph(this); 842 m_sceneGraph = new SceneGraph(this);
843 m_sceneGraph.PhysicsScene = physicsScene;
843 844
844 // If the scene graph has an Unrecoverable error, restart this sim. 845 // If the scene graph has an Unrecoverable error, restart this sim.
845 // Currently the only thing that causes it to happen is two kinds of specific 846 // Currently the only thing that causes it to happen is two kinds of specific
@@ -1075,7 +1076,8 @@ namespace OpenSim.Region.Framework.Scenes
1075 { 1076 {
1076 PhysicalPrims = true; 1077 PhysicalPrims = true;
1077 CollidablePrims = true; 1078 CollidablePrims = true;
1078 PhysicsEnabled = true; 1079 // this is done above acording to config
1080 // PhysicsEnabled = true;
1079 1081
1080 PeriodicBackup = true; 1082 PeriodicBackup = true;
1081 UseBackup = true; 1083 UseBackup = true;