aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie2011-11-11 23:43:18 +0000
committerMelanie2011-11-11 23:43:18 +0000
commita4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e (patch)
treef19e00c12dfe753ee218eccd98b5a21304018247 /OpenSim/Region/Application/OpenSim.cs
parentMerge branch 'master' into bigmerge (diff)
parentMake log messages on authentication failure more explicit (diff)
downloadopensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.zip
opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.gz
opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.bz2
opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1149bd7..3bf2ffd 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -121,7 +121,7 @@ namespace OpenSim
121 Util.FireAndForgetMethod = asyncCallMethod; 121 Util.FireAndForgetMethod = asyncCallMethod;
122 122
123 stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15); 123 stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15);
124 m_consolePrompt = startupConfig.GetString("console_prompt", @"Region (\R) "); 124 m_consolePrompt = startupConfig.GetString("ConsolePrompt", @"Region (\R) ");
125 } 125 }
126 126
127 if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool) 127 if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)