diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index df4dbee..a1bdfb9 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -188,6 +188,18 @@ namespace OpenSim | |||
188 | } | 188 | } |
189 | } | 189 | } |
190 | 190 | ||
191 | // Hook up to the watchdog timer | ||
192 | Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler; | ||
193 | |||
194 | PrintFileToConsole("startuplogo.txt"); | ||
195 | |||
196 | // For now, start at the 'root' level by default | ||
197 | if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it | ||
198 | ChangeSelectedRegion("region", | ||
199 | new string[] {"change", "region", m_sceneManager.Scenes[0].RegionInfo.RegionName}); | ||
200 | else | ||
201 | ChangeSelectedRegion("region", new string[] {"change", "region", "root"}); | ||
202 | |||
191 | //Run Startup Commands | 203 | //Run Startup Commands |
192 | if (String.IsNullOrEmpty(m_startupCommandsFile)) | 204 | if (String.IsNullOrEmpty(m_startupCommandsFile)) |
193 | { | 205 | { |
@@ -206,18 +218,6 @@ namespace OpenSim | |||
206 | m_scriptTimer.Interval = 1200*1000; | 218 | m_scriptTimer.Interval = 1200*1000; |
207 | m_scriptTimer.Elapsed += RunAutoTimerScript; | 219 | m_scriptTimer.Elapsed += RunAutoTimerScript; |
208 | } | 220 | } |
209 | |||
210 | // Hook up to the watchdog timer | ||
211 | Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler; | ||
212 | |||
213 | PrintFileToConsole("startuplogo.txt"); | ||
214 | |||
215 | // For now, start at the 'root' level by default | ||
216 | if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it | ||
217 | ChangeSelectedRegion("region", | ||
218 | new string[] {"change", "region", m_sceneManager.Scenes[0].RegionInfo.RegionName}); | ||
219 | else | ||
220 | ChangeSelectedRegion("region", new string[] {"change", "region", "root"}); | ||
221 | } | 221 | } |
222 | 222 | ||
223 | /// <summary> | 223 | /// <summary> |
@@ -796,6 +796,7 @@ namespace OpenSim | |||
796 | break; | 796 | break; |
797 | 797 | ||
798 | case "backup": | 798 | case "backup": |
799 | MainConsole.Instance.Output("Triggering save of pending object updates to persistent store"); | ||
799 | m_sceneManager.BackupCurrentScene(); | 800 | m_sceneManager.BackupCurrentScene(); |
800 | break; | 801 | break; |
801 | 802 | ||
@@ -806,7 +807,7 @@ namespace OpenSim | |||
806 | if (m_sceneManager.TryGetScene(regRemoveName, out removeScene)) | 807 | if (m_sceneManager.TryGetScene(regRemoveName, out removeScene)) |
807 | RemoveRegion(removeScene, false); | 808 | RemoveRegion(removeScene, false); |
808 | else | 809 | else |
809 | MainConsole.Instance.Output("no region with that name"); | 810 | MainConsole.Instance.Output("No region with that name"); |
810 | break; | 811 | break; |
811 | 812 | ||
812 | case "delete-region": | 813 | case "delete-region": |