OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the loader to actually load the user service data module

remotes/origin/0.6.7-post-fixes
Melanie 2009-09-06 04:44:08 +01:00
parent 2303945b4e
commit bb1d4d23c4
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Services/UserService/UserServiceBase.cs
View File

@ -36,7 +36,7 @@ namespace OpenSim.Services.UserAccountService
{ {
public class UserAccountServiceBase: ServiceBase public class UserAccountServiceBase: ServiceBase
{ {
protected IUserDataPlugin m_Database = null; protected IUserAccountData m_Database = null;
public UserAccountServiceBase(IConfigSource config) : base(config) public UserAccountServiceBase(IConfigSource config) : base(config)
{ {
@ -53,12 +53,12 @@ namespace OpenSim.Services.UserAccountService
string connString = userConfig.GetString("ConnectionString", string connString = userConfig.GetString("ConnectionString",
String.Empty); String.Empty);
m_Database = LoadPlugin<IUserDataPlugin>(dllName); string realm = userConfig.GetString("Realm", "users");
m_Database = LoadPlugin<IUserAccountData>(dllName, new Object[] {connString, realm});
if (m_Database == null) if (m_Database == null)
throw new Exception("Could not find a storage interface in the given module"); throw new Exception("Could not find a storage interface in the given module");
m_Database.Initialise(connString);
} }
} }
} }

10
bin/OpenSim.Server.ini.example
View File

@ -60,3 +60,13 @@ StorageProvider = "OpenSim.Data.MySQL.dll"
ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
; Realm = "auth" ; Realm = "auth"
; * This is the new style user service.
; * "Realm" is the table that is used for user lookup.
; * It defaults to "users", which uses the legacy tables
; *
[UserAccountService]
AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
StorageProvider = "OpenSim.Data.MySQL.dll"
ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
; Realm = "users"