From e86c765be3b0d94c94ff1c5f15a3949ecc857627 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 9 Jun 2014 21:46:24 -0700
Subject: Let HG users be gods too, if they have local permission to be so.

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

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 063ac73..a034c06 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3772,13 +3772,10 @@ 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)
-                {
-                    if (account.UserLevel > 0)
-                        GodLevel = account.UserLevel;
-                    else
-                        GodLevel = 200;
-                }
+                if (account != null && account.UserLevel > 0)
+                    GodLevel = account.UserLevel;
+                else
+                    GodLevel = 200; // local or HG
             }
             else
             {
-- 
cgit v1.1