diff options
| author | Justin Clark-Casey (justincc) | 2011-11-11 23:15:53 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-11 23:15:53 +0000 |
| commit | 6ce3daff94a2d5348d15c66be5091a608ed28217 (patch) | |
| tree | 6cab7fb7cfdb910399a49038cb6045b169ab8299 /OpenSim | |
| parent | As with prim sitting avatars, make an avatar phantom when it sits on the grou... (diff) | |
| download | opensim-SC_OLD-6ce3daff94a2d5348d15c66be5091a608ed28217.zip opensim-SC_OLD-6ce3daff94a2d5348d15c66be5091a608ed28217.tar.gz opensim-SC_OLD-6ce3daff94a2d5348d15c66be5091a608ed28217.tar.bz2 opensim-SC_OLD-6ce3daff94a2d5348d15c66be5091a608ed28217.tar.xz | |
Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.
Addresses http://opensimulator.org/mantis/view.php?id=5786
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index beb75a8..0cad8a9 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) |