Reshuffle to eliminate prim owner lookups unless gridgods are enabled

1 files changed, 7 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 10f4897..b3da36c 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -246,11 +246,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 if (m_scene.RegionInfo.EstateSettings.EstateOwner == user)
                     return true;
             }
-            CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
-            if(profile != null && profile.UserProfile != null)
+            if(m_allowGridGods)
             {
-                if(profile.UserProfile.GodLevel >= 200 && m_allowGridGods)
-                    return true;
+                CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
+                if(profile != null && profile.UserProfile != null)
+                {
+                    if(profile.UserProfile.GodLevel >= 200)
+                        return true;
+                }
             }
 
             return false;