diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs index c982c1a27c..fea8b019ff 100644 --- a/OpenSim/Services/UserService/UserServiceBase.cs +++ b/OpenSim/Services/UserService/UserServiceBase.cs @@ -36,7 +36,7 @@ namespace OpenSim.Services.UserAccountService { public class UserAccountServiceBase: ServiceBase { - protected IUserDataPlugin m_Database = null; + protected IUserAccountData m_Database = null; public UserAccountServiceBase(IConfigSource config) : base(config) { @@ -53,12 +53,12 @@ namespace OpenSim.Services.UserAccountService string connString = userConfig.GetString("ConnectionString", String.Empty); - m_Database = LoadPlugin(dllName); + string realm = userConfig.GetString("Realm", "users"); + + m_Database = LoadPlugin(dllName, new Object[] {connString, realm}); if (m_Database == null) throw new Exception("Could not find a storage interface in the given module"); - - m_Database.Initialise(connString); } } } diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 545d6ce179..5696f079e8 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -60,3 +60,13 @@ StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" ; 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" +