aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorDiva Canto2014-06-09 21:46:24 -0700
committerDiva Canto2014-06-09 21:46:24 -0700
commite86c765be3b0d94c94ff1c5f15a3949ecc857627 (patch)
treed9b70d5dcbf792f925cc1c2f113c32b6d64a4c8b /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-e86c765be3b0d94c94ff1c5f15a3949ecc857627.zip
opensim-SC_OLD-e86c765be3b0d94c94ff1c5f15a3949ecc857627.tar.gz
opensim-SC_OLD-e86c765be3b0d94c94ff1c5f15a3949ecc857627.tar.bz2
opensim-SC_OLD-e86c765be3b0d94c94ff1c5f15a3949ecc857627.tar.xz
Let HG users be gods too, if they have local permission to be so.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs11
1 files changed, 4 insertions, 7 deletions
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
3772 // who is granted god powers, but has no god level set. 3772 // who is granted god powers, but has no god level set.
3773 // 3773 //
3774 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, agentID); 3774 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, agentID);
3775 if (account != null) 3775 if (account != null && account.UserLevel > 0)
3776 { 3776 GodLevel = account.UserLevel;
3777 if (account.UserLevel > 0) 3777 else
3778 GodLevel = account.UserLevel; 3778 GodLevel = 200; // local or HG
3779 else
3780 GodLevel = 200;
3781 }
3782 } 3779 }
3783 else 3780 else
3784 { 3781 {