aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-10 17:19:40 -0800
committerDiva Canto2010-01-10 17:19:40 -0800
commiteb6d49e02ca89aa8a834fc964881e30eb17251a4 (patch)
tree4295c0b1a4abc2ee2246b40e6b9a6e6280e2f344
parentMoved OpenId authentication from user server to Server.Handlers.Authentication. (diff)
downloadopensim-SC_OLD-eb6d49e02ca89aa8a834fc964881e30eb17251a4.zip
opensim-SC_OLD-eb6d49e02ca89aa8a834fc964881e30eb17251a4.tar.gz
opensim-SC_OLD-eb6d49e02ca89aa8a834fc964881e30eb17251a4.tar.bz2
opensim-SC_OLD-eb6d49e02ca89aa8a834fc964881e30eb17251a4.tar.xz
Fixed small inconsistency in config var name.
-rw-r--r--OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs2
-rw-r--r--bin/OpenSim.Server.ini.example6
2 files changed, 6 insertions, 2 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)
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index c76ac4d..1b5aef2 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -67,7 +67,7 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
67; * 67; *
68[AuthenticationService] 68[AuthenticationService]
69 ; for the server connector 69 ; for the server connector
70 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 70 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
71 ; for the service 71 ; for the service
72 StorageProvider = "OpenSim.Data.MySQL.dll" 72 StorageProvider = "OpenSim.Data.MySQL.dll"
73 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" 73 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
@@ -90,7 +90,9 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
90 ; Realm = "useraccounts" 90 ; Realm = "useraccounts"
91 91
92[PresenceService] 92[PresenceService]
93 ; for the server connector
93 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" 94 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
95 ; for the service
94 StorageProvider = "OpenSim.Data.MySQL.dll" 96 StorageProvider = "OpenSim.Data.MySQL.dll"
95 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" 97 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
96 98
@@ -99,7 +101,9 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
99 DefaultLibrary = "./inventory/Libraries.xml" 101 DefaultLibrary = "./inventory/Libraries.xml"
100 102
101[LoginService] 103[LoginService]
104 ; for the server connector
102 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 105 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
106 ; for the service
103 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 107 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
104 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 108 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
105 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 109 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"