diff options
| author | Melanie | 2010-06-25 20:26:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-25 20:26:48 +0100 |
| commit | dc9e9931eb6e1614d2a2a5f8c28941b5d6280103 (patch) | |
| tree | 57a9714e264575c2b6045db07952495b81adeb6e /OpenSim/Region/Application/OpenSim.cs | |
| parent | Make "Allow other residents to edit terrain" default to FALSE (diff) | |
| parent | fix web request exception reporting properly this time (diff) | |
| download | opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.zip opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.tar.gz opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.tar.bz2 opensim-SC-dc9e9931eb6e1614d2a2a5f8c28941b5d6280103.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 75561a7..cb48ac1 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -192,9 +192,7 @@ namespace OpenSim | |||
| 192 | // Hook up to the watchdog timer | 192 | // Hook up to the watchdog timer |
| 193 | Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler; | 193 | Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler; |
| 194 | 194 | ||
| 195 | PrintFileToConsole("startuplogo.txt"); | 195 | PrintFileToConsole("startuplogo.txt"); |
| 196 | |||
| 197 | m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString()); | ||
| 198 | 196 | ||
| 199 | // For now, start at the 'root' level by default | 197 | // For now, start at the 'root' level by default |
| 200 | if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it | 198 | if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it |