diff options
| author | Melanie | 2011-11-05 11:17:40 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 11:17:40 +0000 |
| commit | 03f5bbcaf2a58990b59d573cdde671ae803e2224 (patch) | |
| tree | caa6bad1f5f66f7933be6f6f36013e26fba7a100 /OpenSim/Services | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | add myself to the contributors.txt (diff) | |
| download | opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.zip opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.gz opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.bz2 opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index d8a2054..35b43f4 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -126,6 +126,9 @@ namespace OpenSim.Services.LLLoginService | |||
| 126 | if (accountService == string.Empty || authService == string.Empty) | 126 | if (accountService == string.Empty || authService == string.Empty) |
| 127 | throw new Exception("LoginService is missing service specifications"); | 127 | throw new Exception("LoginService is missing service specifications"); |
| 128 | 128 | ||
| 129 | // replace newlines in welcome message | ||
| 130 | m_WelcomeMessage = m_WelcomeMessage.Replace("\\n", "\n"); | ||
| 131 | |||
| 129 | Object[] args = new Object[] { config }; | 132 | Object[] args = new Object[] { config }; |
| 130 | m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); | 133 | m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); |
| 131 | m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args); | 134 | m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args); |