diff options
| author | Melanie | 2011-04-08 04:16:29 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-08 04:16:29 +0100 |
| commit | 738daadaceada157eb0a8ea4a3437e037859b4d2 (patch) | |
| tree | 1d0f8d63180928d77a7842e73c56e922666af75b /OpenSim/Region/Application | |
| parent | Add support for the new display name related functions in LSL. This does not (diff) | |
| parent | trivial whitespace removal to trigger a panda rebuild (diff) | |
| download | opensim-SC-738daadaceada157eb0a8ea4a3437e037859b4d2.zip opensim-SC-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.gz opensim-SC-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.bz2 opensim-SC-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index d120f03..7e320e6 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -250,9 +250,7 @@ namespace OpenSim | |||
| 250 | m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); | 250 | m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); |
| 251 | 251 | ||
| 252 | // load Crash directory config | 252 | // load Crash directory config |
| 253 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); | 253 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); |
| 254 | |||
| 255 | |||
| 256 | 254 | ||
| 257 | if (background) | 255 | if (background) |
| 258 | { | 256 | { |
| @@ -260,15 +258,9 @@ namespace OpenSim | |||
| 260 | m_sim.Startup(); | 258 | m_sim.Startup(); |
| 261 | } | 259 | } |
| 262 | else | 260 | else |
| 263 | { | 261 | { |
| 264 | |||
| 265 | |||
| 266 | |||
| 267 | |||
| 268 | m_sim = new OpenSim(configSource); | 262 | m_sim = new OpenSim(configSource); |
| 269 | 263 | ||
| 270 | |||
| 271 | |||
| 272 | m_sim.Startup(); | 264 | m_sim.Startup(); |
| 273 | 265 | ||
| 274 | while (true) | 266 | while (true) |