aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-09-06 04:44:08 +0100
committerMelanie2009-09-06 04:44:08 +0100
commitbb1d4d23c4703cde5c3f7f7d2d123a8abaac3cfa (patch)
tree90bacaf199aa90b3f32ca4a36e818d93045d2e8d
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-bb1d4d23c4703cde5c3f7f7d2d123a8abaac3cfa.zip
opensim-SC_OLD-bb1d4d23c4703cde5c3f7f7d2d123a8abaac3cfa.tar.gz
opensim-SC_OLD-bb1d4d23c4703cde5c3f7f7d2d123a8abaac3cfa.tar.bz2
opensim-SC_OLD-bb1d4d23c4703cde5c3f7f7d2d123a8abaac3cfa.tar.xz
Change the loader to actually load the user service data module
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/UserService/UserServiceBase.cs8
-rw-r--r--bin/OpenSim.Server.ini.example10
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs
index c982c1a..fea8b01 100644
--- a/OpenSim/Services/UserService/UserServiceBase.cs
+++ b/OpenSim/Services/UserService/UserServiceBase.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Services.UserAccountService
36{ 36{
37 public class UserAccountServiceBase: ServiceBase 37 public class UserAccountServiceBase: ServiceBase
38 { 38 {
39 protected IUserDataPlugin m_Database = null; 39 protected IUserAccountData m_Database = null;
40 40
41 public UserAccountServiceBase(IConfigSource config) : base(config) 41 public UserAccountServiceBase(IConfigSource config) : base(config)
42 { 42 {
@@ -53,12 +53,12 @@ namespace OpenSim.Services.UserAccountService
53 string connString = userConfig.GetString("ConnectionString", 53 string connString = userConfig.GetString("ConnectionString",
54 String.Empty); 54 String.Empty);
55 55
56 m_Database = LoadPlugin<IUserDataPlugin>(dllName); 56 string realm = userConfig.GetString("Realm", "users");
57
58 m_Database = LoadPlugin<IUserAccountData>(dllName, new Object[] {connString, realm});
57 59
58 if (m_Database == null) 60 if (m_Database == null)
59 throw new Exception("Could not find a storage interface in the given module"); 61 throw new Exception("Could not find a storage interface in the given module");
60
61 m_Database.Initialise(connString);
62 } 62 }
63 } 63 }
64} 64}
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 545d6ce..5696f07 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -60,3 +60,13 @@ StorageProvider = "OpenSim.Data.MySQL.dll"
60ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 60ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
61; Realm = "auth" 61; Realm = "auth"
62 62
63; * This is the new style user service.
64; * "Realm" is the table that is used for user lookup.
65; * It defaults to "users", which uses the legacy tables
66; *
67[UserAccountService]
68AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
69StorageProvider = "OpenSim.Data.MySQL.dll"
70ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
71; Realm = "users"
72