OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge issue

avinationmerge
Melanie 2012-03-07 00:58:01 +00:00
parent caa19862fa
commit 5884d08062
1 changed files with 85 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -653,6 +653,8 @@ namespace OpenSim.Region.Framework.Scenes
// Region config overrides global config // Region config overrides global config
// //
try
{
if (m_config.Configs["Startup"] != null) if (m_config.Configs["Startup"] != null)
{ {
IConfig startupConfig = m_config.Configs["Startup"]; IConfig startupConfig = m_config.Configs["Startup"];
@ -747,6 +749,7 @@ namespace OpenSim.Region.Framework.Scenes
m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain);
m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning);
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString()); m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString());