diff options
author | Melanie | 2011-05-24 04:03:36 +0100 |
---|---|---|
committer | Melanie | 2011-05-24 04:03:36 +0100 |
commit | d1870d0c47c06c06c5ce4b84ea549360e31c15c7 (patch) | |
tree | e0297b02389893bca111b35b693becdf20c373a7 /OpenSim/Region | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Allow disabling the legacy backup mechanism to avoid the object clone if (diff) | |
download | opensim-SC-d1870d0c47c06c06c5ce4b84ea549360e31c15c7.zip opensim-SC-d1870d0c47c06c06c5ce4b84ea549360e31c15c7.tar.gz opensim-SC-d1870d0c47c06c06c5ce4b84ea549360e31c15c7.tar.bz2 opensim-SC-d1870d0c47c06c06c5ce4b84ea549360e31c15c7.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 10 insertions, 1 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); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b100b39..62277ff 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1613,7 +1613,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1613 | 1613 | ||
1614 | } | 1614 | } |
1615 | 1615 | ||
1616 | if (HasGroupChanged) | 1616 | if (m_scene.UseBackup && HasGroupChanged) |
1617 | { | 1617 | { |
1618 | // don't backup while it's selected or you're asking for changes mid stream. | 1618 | // don't backup while it's selected or you're asking for changes mid stream. |
1619 | if (isTimeToPersist() || forcedBackup) | 1619 | if (isTimeToPersist() || forcedBackup) |