diff options
| author | Tom Grimshaw | 2010-06-25 14:26:07 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-25 14:26:07 -0700 |
| commit | 30397b6fbc3a94dfca4073f36a2b4ff011b1618c (patch) | |
| tree | 9f6f7531de18c285f506ae1ec8a60e43fe8d418f /OpenSim/Region/Application/OpenSim.cs | |
| parent | Add two events: OnAttachToBackup and OnDetachFromBackup. (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-30397b6fbc3a94dfca4073f36a2b4ff011b1618c.zip opensim-SC_OLD-30397b6fbc3a94dfca4073f36a2b4ff011b1618c.tar.gz opensim-SC_OLD-30397b6fbc3a94dfca4073f36a2b4ff011b1618c.tar.bz2 opensim-SC_OLD-30397b6fbc3a94dfca4073f36a2b4ff011b1618c.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -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 |