aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2012-01-10 11:11:08 -0800
committerDiva Canto2012-01-10 11:11:08 -0800
commitce44f56af97cb84ae8cc6e33c0330c44dd8bed96 (patch)
treeda1bc3a8f858a8566ac7d4c70c152a5e2b7b52b3 /OpenSim/Region/Framework/Scenes
parentHG landing points: this hopefully fixes some confusion that was making HG avi... (diff)
parentAdd avatar names to appearance log messages (diff)
downloadopensim-SC_OLD-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.zip
opensim-SC_OLD-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.tar.gz
opensim-SC_OLD-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.tar.bz2
opensim-SC_OLD-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ed6f68a..f03c345 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -651,8 +651,6 @@ namespace OpenSim.Region.Framework.Scenes
651 // 651 //
652 IConfig startupConfig = m_config.Configs["Startup"]; 652 IConfig startupConfig = m_config.Configs["Startup"];
653 653
654 DEBUG = startupConfig.GetBoolean("DEBUG", false);
655
656 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); 654 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
657 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup); 655 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
658 if (!m_useBackup) 656 if (!m_useBackup)