2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
index 3b4fda2..ae2c5ac 100644
--- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
+++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Services.Interfaces
         // DefaultObjectPermMasks
         public int PermEveryone = 0;
         public int PermGroup = 0;
-        public int PermNextOwner = 532480;
+        public int PermNextOwner = 0; // Illegal value by design
     }
 
     public interface IAgentPreferencesService
diff --git a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
index 1808ee5..5013152 100644
--- a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
+++ b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs
@@ -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;
         }