aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorDiva Canto2011-05-26 15:52:34 -0700
committerDiva Canto2011-05-26 15:52:34 -0700
commitb17afe43c4f72bace2bd991d4cac83837acb9a67 (patch)
treee23aae27316b018065890b77028dfa4706981d5e /OpenSim/Region/Framework/Scenes/Scene.cs
parentHG IM in grid mode working fairly well. Unknown target user references looked... (diff)
parentimprove help information for "appearance show" (diff)
downloadopensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.zip
opensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.gz
opensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.bz2
opensim-SC_OLD-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b9690fe..4aae13c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -204,6 +204,7 @@ namespace OpenSim.Region.Framework.Scenes
204 204
205 private Timer m_mapGenerationTimer = new Timer(); 205 private Timer m_mapGenerationTimer = new Timer();
206 private bool m_generateMaptiles; 206 private bool m_generateMaptiles;
207 private bool m_useBackup = true;
207 208
208// private Dictionary<UUID, string[]> m_UserNamesCache = new Dictionary<UUID, string[]>(); 209// private Dictionary<UUID, string[]> m_UserNamesCache = new Dictionary<UUID, string[]>();
209 210
@@ -459,6 +460,11 @@ namespace OpenSim.Region.Framework.Scenes
459 get { return m_sceneGraph; } 460 get { return m_sceneGraph; }
460 } 461 }
461 462
463 public bool UseBackup
464 {
465 get { return m_useBackup; }
466 }
467
462 // an instance to the physics plugin's Scene object. 468 // an instance to the physics plugin's Scene object.
463 public PhysicsScene PhysicsScene 469 public PhysicsScene PhysicsScene
464 { 470 {
@@ -647,6 +653,9 @@ namespace OpenSim.Region.Framework.Scenes
647 IConfig startupConfig = m_config.Configs["Startup"]; 653 IConfig startupConfig = m_config.Configs["Startup"];
648 654
649 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); 655 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
656 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
657 if (!m_useBackup)
658 m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);
650 659
651 //Animation states 660 //Animation states
652 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); 661 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
@@ -1064,6 +1073,8 @@ namespace OpenSim.Region.Framework.Scenes
1064 shuttingdown = true; 1073 shuttingdown = true;
1065 1074
1066 m_log.Debug("[SCENE]: Persisting changed objects"); 1075 m_log.Debug("[SCENE]: Persisting changed objects");
1076 EventManager.TriggerSceneShuttingDown(this);
1077
1067 EntityBase[] entities = GetEntities(); 1078 EntityBase[] entities = GetEntities();
1068 foreach (EntityBase entity in entities) 1079 foreach (EntityBase entity in entities)
1069 { 1080 {