ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2011-04-08 04:16:29 +01:00
parent 33dd74e410 d31175060f
commit 738daadace
73 changed files with 170 additions and 6291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Application/Application.cs
View File

@@ -250,9 +250,7 @@ namespace OpenSim
m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
// load Crash directory config
m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
if (background)
{
@@ -260,15 +258,9 @@ namespace OpenSim
m_sim.Startup();
}
else
{
{
m_sim = new OpenSim(configSource);
m_sim.Startup();
while (true)