2 files changed, 24 insertions, 20 deletions

diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 038e993..35fe31b 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -37,7 +37,6 @@ using OpenSim.Data;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
-using OpenSim.Services.UserAccountService;
 
 namespace OpenSim.Services.ProfilesService
 {
@@ -48,7 +47,6 @@ namespace OpenSim.Services.ProfilesService
                 MethodBase.GetCurrentMethod().DeclaringType);
         
         IUserAccountService userAccounts;
-        IAuthenticationService authService;
 
         public UserProfilesService(IConfigSource config, string configName):
             base(config, configName)
@@ -56,7 +54,7 @@ namespace OpenSim.Services.ProfilesService
             IConfig Config = config.Configs[configName];
             if (Config == null)
             {
-                m_log.Warn("[PROFILES]: No configuration found!");
+                m_log.Warn("[PROFILES SERVICE]: No configuration found!");
                 return;
             }
             Object[] args = null;
@@ -67,9 +65,6 @@ namespace OpenSim.Services.ProfilesService
                 userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
             
             args = new Object[] { config };
-            string authServiceConfig = Config.GetString("AuthenticationServiceModule", String.Empty);
-            if (accountService != string.Empty)
-                authService = ServerUtils.LoadPlugin<IAuthenticationService>(authServiceConfig, args);
         }
         
         #region Classifieds
@@ -178,23 +173,22 @@ namespace OpenSim.Services.ProfilesService
                         account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
                         if(string.IsNullOrEmpty(account.Email))
                         {
-                            result = "No Email address on record!";
-                            return false;
+                            pref.EMail = string.Empty;
                         }
                         else
                             pref.EMail = account.Email;
                     }
                     catch
                     {
-                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
-                        result = "Missing Email address!";
+                        m_log.Error ("[PROFILES SERVICE]: UserAccountService Exception: Could not get user account");
+                        result = "UserAccountService settings error in UserProfileService!";
                         return false;
                     }
                 }
                 else
                 {
-                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
-                    result = "Missing Email address!";
+                    m_log.Error ("[PROFILES SERVICE]: UserAccountService: Could not get user account");
+                    result = "UserAccountService settings error in UserProfileService!";
                     return false;
                 }
             }
@@ -203,6 +197,9 @@ namespace OpenSim.Services.ProfilesService
 
         public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
         {
+            if (!ProfilesData.GetUserPreferences(ref pref, ref result))
+                return false;
+
             if(string.IsNullOrEmpty(pref.EMail))
             {
                 UserAccount account = new UserAccount();
@@ -213,27 +210,33 @@ namespace OpenSim.Services.ProfilesService
                         account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
                         if(string.IsNullOrEmpty(account.Email))
                         {
-                            result = "No Email address on record!";
-                            return false;
+                            pref.EMail = string.Empty;
                         }
                         else
+                        {
                             pref.EMail = account.Email;
+                            UserPreferencesUpdate(ref pref, ref result);
+                        }
                     }
                     catch
                     {
-                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
-                        result = "Missing Email address!";
+                        m_log.Error ("[PROFILES SERVICE]: UserAccountService Exception: Could not get user account");
+                        result = "UserAccountService settings error in UserProfileService!";
                         return false;
                     }
                 }
                 else
                 {
-                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
-                    result = "Missing Email address!";
+                    m_log.Error ("[PROFILES SERVICE]: UserAccountService: Could not get user account");
+                    result = "UserAccountService settings error in UserProfileService!";
                     return false;
                 }
             }
-            return ProfilesData.GetUserPreferences(ref pref, ref result);
+
+            if(string.IsNullOrEmpty(pref.EMail))
+                pref.EMail = "No Email Address On Record";
+
+            return true;
         }
         #endregion User Preferences
         */
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
index 927f7c9..c31578f 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Services.ProfilesService
         {
             if(string.IsNullOrEmpty(configName))
             {
-                m_log.WarnFormat("[PROFILES]: Configuration section not given!");
+                m_log.WarnFormat("[PROFILES SERVICE]: Configuration section not given!");
                 return;
             }
 
@@ -72,6 +72,7 @@ namespace OpenSim.Services.ProfilesService
             IConfig ProfilesConfig = config.Configs[configName];
             if (ProfilesConfig != null)
             {
+                dllName = ProfilesConfig.GetString("StorageProvider", dllName);
                 connString = ProfilesConfig.GetString("ConnectionString", connString);
                 realm = ProfilesConfig.GetString("Realm", realm);
             }