From 8eb7c9d0fbd0804c186a086c531dd88fd23ba0b5 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 6 Jan 2017 02:14:56 +0000
Subject: [PATCH] Fix the mixed gods issue in all places

---
 .../Region/Framework/Scenes/GodController.cs  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index 95fdc02a41..5146ea0bfc 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -113,6 +113,15 @@ namespace OpenSim.Region.Framework.Scenes
 
         }
 
+        protected int PotentialGodLevel()
+        {
+            int godLevel = m_allowGridGods ? m_userLevel : 200;
+            if ((!m_forceGridGods) && m_userLevel < 200)
+                godLevel = 200;
+
+            return godLevel;
+        }
+
         protected bool CanBeGod()
         {
             bool canBeGod = false;
@@ -143,9 +152,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             bool shoudBeGod = m_forceGodModeAlwaysOn ? canBeGod : (m_viewerUiIsGod && canBeGod);
 
-            int godLevel = m_allowGridGods ? m_userLevel : 200;
-            if ((!m_forceGridGods) && m_userLevel < 200)
-                godLevel = 200;
+            int godLevel = PotentialGodLevel();
 
             if (!shoudBeGod)
                 godLevel = 0;
@@ -172,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (!CanBeGod())
                 return false;
 
-            int godLevel = m_allowGridGods ? m_userLevel : 200;
+            int godLevel = PotentialGodLevel();
 
             if (!m_viewerUiIsGod)
                 m_scenePresence.ControllingClient.SendAdminResponse(UUID.Zero, (uint)godLevel);
@@ -211,7 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                int godLevel = m_allowGridGods ? m_userLevel : 200;
+                int godLevel = PotentialGodLevel();
                 if (!m_viewerUiIsGod)
                     godLevel = 0;
 
@@ -223,7 +230,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                int godLevel = m_allowGridGods ? m_userLevel : 200;
+                int godLevel = PotentialGodLevel();
                 if (m_viewerUiIsGod)
                     return godLevel;