From 206faf0218b5bc8467a8d0468170995d1d2ae66d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 18 Jun 2016 17:00:15 -0700
Subject: Guard against occurring null ref.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5a9f88e..c9c8639 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2571,7 +2571,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     AgentPrefs prefs = AgentPreferencesService.GetAgentPreferences(ownerID);
                     // Only apply user selected prefs if the user set them
-                    if (prefs.PermNextOwner != 0)
+                    if (prefs != null && prefs.PermNextOwner != 0)
                     {
                         sceneObject.RootPart.GroupMask = (uint)prefs.PermGroup;
                         sceneObject.RootPart.EveryoneMask = (uint)prefs.PermEveryone;
-- 
cgit v1.1