aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2014-03-27 12:36:30 -0400
committerBlueWall2014-03-27 12:36:30 -0400
commit9c7b28341c2fc26fc5e2d3e43967c5579d8cfa20 (patch)
tree23d613a5cd67c761b03a70be53e304b3af0c0c38
parentMerge branch 'master' into m_test (diff)
downloadopensim-SC-9c7b28341c2fc26fc5e2d3e43967c5579d8cfa20.zip
opensim-SC-9c7b28341c2fc26fc5e2d3e43967c5579d8cfa20.tar.gz
opensim-SC-9c7b28341c2fc26fc5e2d3e43967c5579d8cfa20.tar.bz2
opensim-SC-9c7b28341c2fc26fc5e2d3e43967c5579d8cfa20.tar.xz
Add support for specifying non-default StorageProvider
-rw-r--r--OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
index 927f7c9..2f28bfb 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -72,6 +72,9 @@ namespace OpenSim.Services.ProfilesService
72 IConfig ProfilesConfig = config.Configs[configName]; 72 IConfig ProfilesConfig = config.Configs[configName];
73 if (ProfilesConfig != null) 73 if (ProfilesConfig != null)
74 { 74 {
75 if (dllName == String.Empty)
76 dllName = dbConfig.GetString("StorageProvider", String.Empty);
77
75 connString = ProfilesConfig.GetString("ConnectionString", connString); 78 connString = ProfilesConfig.GetString("ConnectionString", connString);
76 realm = ProfilesConfig.GetString("Realm", realm); 79 realm = ProfilesConfig.GetString("Realm", realm);
77 } 80 }