diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs index 2abef0a..adb1e5b 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs | |||
| @@ -49,7 +49,7 @@ namespace OpenSim.Server.Handlers.Authentication | |||
| 49 | if (serverConfig == null) | 49 | if (serverConfig == null) |
| 50 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); | 50 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); |
| 51 | 51 | ||
| 52 | string authenticationService = serverConfig.GetString("AuthenticationServiceModule", | 52 | string authenticationService = serverConfig.GetString("LocalServiceModule", |
| 53 | String.Empty); | 53 | String.Empty); |
| 54 | 54 | ||
| 55 | if (authenticationService == String.Empty) | 55 | if (authenticationService == String.Empty) |