aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs46
1 files changed, 3 insertions, 43 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b4b5869..1b6d483 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -932,23 +932,7 @@ namespace OpenSim.Region.Framework.Scenes
932 EventManager.OnLandObjectRemoved += 932 EventManager.OnLandObjectRemoved +=
933 new EventManager.LandObjectRemoved(simDataService.RemoveLandObject); 933 new EventManager.LandObjectRemoved(simDataService.RemoveLandObject);
934 934
935 m_sceneGraph = new SceneGraph(this); 935 RegisterDefaultSceneEvents();
936 m_sceneGraph.PhysicsScene = PhysicsScene;
937
938 // If the scene graph has an Unrecoverable error, restart this sim.
939 // Currently the only thing that causes it to happen is two kinds of specific
940 // Physics based crashes.
941 //
942 // Out of memory
943 // Operating system has killed the plugin
944 m_sceneGraph.UnRecoverableError
945 += () =>
946 {
947 m_log.ErrorFormat("[SCENE]: Restarting region {0} due to unrecoverable physics crash", Name);
948 RestartNow();
949 };
950
951 RegisterDefaultSceneEvents();
952 936
953 // XXX: Don't set the public property since we don't want to activate here. This needs to be handled 937 // XXX: Don't set the public property since we don't want to activate here. This needs to be handled
954 // better in the future. 938 // better in the future.
@@ -1199,8 +1183,7 @@ namespace OpenSim.Region.Framework.Scenes
1199 1183
1200 StatsReporter.OnSendStatsResult += SendSimStatsPackets; 1184 StatsReporter.OnSendStatsResult += SendSimStatsPackets;
1201 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; 1185 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
1202 1186
1203 MainConsole.Instance.Commands.AddCommand("scene", false, "gc collect", "gc collect", "gc collect", "Cause the garbage collector to make a single pass", HandleGcCollect);
1204 } 1187 }
1205 1188
1206 public Scene(RegionInfo regInfo) 1189 public Scene(RegionInfo regInfo)
@@ -1223,36 +1206,13 @@ namespace OpenSim.Region.Framework.Scenes
1223 1206
1224 PhysicalPrims = true; 1207 PhysicalPrims = true;
1225 CollidablePrims = true; 1208 CollidablePrims = true;
1226 // this is done above acording to config 1209 PhysicsEnabled = true;
1227 // PhysicsEnabled = true;
1228 1210
1229 AllowAvatarCrossing = true; 1211 AllowAvatarCrossing = true;
1230 1212
1231 PeriodicBackup = true; 1213 PeriodicBackup = true;
1232 UseBackup = true; 1214 UseBackup = true;
1233 1215
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256 IsReprioritizationEnabled = true; 1216 IsReprioritizationEnabled = true;
1257 UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time; 1217 UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time;
1258 ReprioritizationInterval = 5000; 1218 ReprioritizationInterval = 5000;