From 807fb8339bf69b246bd8cb92241bab7b5e75f0f1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 9 Jun 2014 22:00:10 -0700
Subject: Revert "Let HG users be gods too, if they have local permission to be
 so." HG gods are not safe at this point. It's better to disallow this until
 they can be made safe.

This reverts commit e86c765be3b0d94c94ff1c5f15a3949ecc857627.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a034c06..063ac73 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3772,10 +3772,13 @@ namespace OpenSim.Region.Framework.Scenes
                 // who is granted god powers, but has no god level set.
                 //
                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, agentID);
-                if (account != null && account.UserLevel > 0)
-                    GodLevel = account.UserLevel;
-                else
-                    GodLevel = 200; // local or HG
+                if (account != null)
+                {
+                    if (account.UserLevel > 0)
+                        GodLevel = account.UserLevel;
+                    else
+                        GodLevel = 200;
+                }
             }
             else
             {
-- 
cgit v1.1