ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
This commit is contained in:
Melanie
2011-11-11 23:43:18 +00:00
parent ed9500f08c 25c32061e4
commit a4ec97cfdd
6 changed files with 398 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ namespace OpenSim
Util.FireAndForgetMethod = asyncCallMethod;
stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15);
m_consolePrompt = startupConfig.GetString("console_prompt", @"Region (\R) ");
m_consolePrompt = startupConfig.GetString("ConsolePrompt", @"Region (\R) ");
}
if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)