Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
index 1808ee5..c473d4a 100644
--- a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
+++ b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Services.UserAccountService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public AgentPreferencesService(IConfigSource config) : base(config) 
+        public AgentPreferencesService(IConfigSource config) : base(config)
         {
             m_log.Debug("[AGENT PREFERENCES SERVICE]: Starting agent preferences service");
         }
@@ -49,7 +49,7 @@ namespace OpenSim.Services.UserAccountService
         public AgentPrefs GetAgentPreferences(UUID principalID)
         {
             AgentPreferencesData d = m_Database.GetPrefs(principalID);
-            AgentPrefs prefs = (d == null) ? new AgentPrefs(principalID) : new AgentPrefs(d.Data);
+            AgentPrefs prefs = (d == null) ? null : new AgentPrefs(d.Data);
             return prefs;
         }