From bb1d4d23c4703cde5c3f7f7d2d123a8abaac3cfa Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sun, 6 Sep 2009 04:44:08 +0100
Subject: [PATCH] Change the loader to actually load the user service data
 module

---
 OpenSim/Services/UserService/UserServiceBase.cs |  8 ++++----
 bin/OpenSim.Server.ini.example                  | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

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<IUserDataPlugin>(dllName);
+            string realm = userConfig.GetString("Realm", "users");
+
+            m_Database = LoadPlugin<IUserAccountData>(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"
+