diff options
author | Melanie | 2011-05-24 03:37:25 +0200 |
---|---|---|
committer | Melanie | 2011-05-24 03:37:25 +0200 |
commit | 62e0c960363e0949bbc41b072a0dfffb90d19762 (patch) | |
tree | e0297b02389893bca111b35b693becdf20c373a7 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-62e0c960363e0949bbc41b072a0dfffb90d19762.zip opensim-SC-62e0c960363e0949bbc41b072a0dfffb90d19762.tar.gz opensim-SC-62e0c960363e0949bbc41b072a0dfffb90d19762.tar.bz2 opensim-SC-62e0c960363e0949bbc41b072a0dfffb90d19762.tar.xz |
Allow disabling the legacy backup mechanism to avoid the object clone if
backup is not used.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5085396..254ad05 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -209,6 +209,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
209 | 209 | ||
210 | private Timer m_mapGenerationTimer = new Timer(); | 210 | private Timer m_mapGenerationTimer = new Timer(); |
211 | private bool m_generateMaptiles; | 211 | private bool m_generateMaptiles; |
212 | private bool m_useBackup = true; | ||
212 | 213 | ||
213 | // private Dictionary<UUID, string[]> m_UserNamesCache = new Dictionary<UUID, string[]>(); | 214 | // private Dictionary<UUID, string[]> m_UserNamesCache = new Dictionary<UUID, string[]>(); |
214 | 215 | ||
@@ -477,6 +478,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
477 | get { return m_sceneGraph; } | 478 | get { return m_sceneGraph; } |
478 | } | 479 | } |
479 | 480 | ||
481 | public bool UseBackup | ||
482 | { | ||
483 | get { return m_useBackup; } | ||
484 | } | ||
485 | |||
480 | // an instance to the physics plugin's Scene object. | 486 | // an instance to the physics plugin's Scene object. |
481 | public PhysicsScene PhysicsScene | 487 | public PhysicsScene PhysicsScene |
482 | { | 488 | { |
@@ -670,6 +676,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
670 | IConfig startupConfig = m_config.Configs["Startup"]; | 676 | IConfig startupConfig = m_config.Configs["Startup"]; |
671 | 677 | ||
672 | m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); | 678 | m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); |
679 | m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup); | ||
680 | if (!m_useBackup) | ||
681 | m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName); | ||
673 | 682 | ||
674 | //Animation states | 683 | //Animation states |
675 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 684 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |