aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorlbsa712008-09-08 14:30:35 +0000
committerlbsa712008-09-08 14:30:35 +0000
commit8388fe0669f9d140028d1925284491b21a09a1bf (patch)
tree80c7729bef9b88a371c3f561322a97faf262ade6 /OpenSim/Region/Application/OpenSim.cs
parentMantis #2144 (diff)
downloadopensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.zip
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.gz
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.bz2
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.xz
* some if inversions and added {}'s for readability
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index edb29db..43c1d26 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -77,6 +77,7 @@ namespace OpenSim
77 77
78 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 78 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
79 } 79 }
80
80 base.ReadConfigSettings(); 81 base.ReadConfigSettings();
81 } 82 }
82 83
@@ -96,13 +97,13 @@ namespace OpenSim
96 base.Startup(); 97 base.Startup();
97 98
98 //Run Startup Commands 99 //Run Startup Commands
99 if (m_startupCommandsFile != String.Empty) 100 if (String.IsNullOrEmpty( m_startupCommandsFile ))
100 { 101 {
101 RunCommandScript(m_startupCommandsFile); 102 m_log.Info("[STARTUP]: No startup command script specified. Moving on...");
102 } 103 }
103 else 104 else
104 { 105 {
105 m_log.Info("[STARTUP]: No startup command script specified. Moving on..."); 106 RunCommandScript(m_startupCommandsFile);
106 } 107 }
107 108
108 // Start timer script (run a script every xx seconds) 109 // Start timer script (run a script every xx seconds)
@@ -365,6 +366,7 @@ namespace OpenSim
365 { 366 {
366 m_sceneManager.TrySetCurrentScene(".."); 367 m_sceneManager.TrySetCurrentScene("..");
367 } 368 }
369
368 m_regionData.Remove(killScene.RegionInfo); 370 m_regionData.Remove(killScene.RegionInfo);
369 m_sceneManager.CloseScene(killScene); 371 m_sceneManager.CloseScene(killScene);
370 } 372 }