aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2014-03-27 13:27:46 -0400
committerBlueWall2014-03-27 13:27:46 -0400
commit20640357ab50b77e59ad53fc68349065a9042a1a (patch)
treebec764430fce3b3a574162df0cff77610f3febdc /OpenSim
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
downloadopensim-SC_OLD-20640357ab50b77e59ad53fc68349065a9042a1a.zip
opensim-SC_OLD-20640357ab50b77e59ad53fc68349065a9042a1a.tar.gz
opensim-SC_OLD-20640357ab50b77e59ad53fc68349065a9042a1a.tar.bz2
opensim-SC_OLD-20640357ab50b77e59ad53fc68349065a9042a1a.tar.xz
Fix to local StorageProvider override
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
index 2f28bfb..8eddc8a 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -72,9 +72,7 @@ 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) 75 dllName = dbConfig.GetString("StorageProvider", dllName);
76 dllName = dbConfig.GetString("StorageProvider", String.Empty);
77
78 connString = ProfilesConfig.GetString("ConnectionString", connString); 76 connString = ProfilesConfig.GetString("ConnectionString", connString);
79 realm = ProfilesConfig.GetString("Realm", realm); 77 realm = ProfilesConfig.GetString("Realm", realm);
80 } 78 }