aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2014-06-09 22:00:10 -0700
committerDiva Canto2014-06-09 22:00:10 -0700
commit807fb8339bf69b246bd8cb92241bab7b5e75f0f1 (patch)
tree886594d2b50ec481feee601bc0e7169de23ab537 /OpenSim/Region/Framework/Scenes
parentLet HG users be gods too, if they have local permission to be so. (diff)
downloadopensim-SC-807fb8339bf69b246bd8cb92241bab7b5e75f0f1.zip
opensim-SC-807fb8339bf69b246bd8cb92241bab7b5e75f0f1.tar.gz
opensim-SC-807fb8339bf69b246bd8cb92241bab7b5e75f0f1.tar.bz2
opensim-SC-807fb8339bf69b246bd8cb92241bab7b5e75f0f1.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs11
1 files 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
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 && account.UserLevel > 0) 3775 if (account != null)
3776 GodLevel = account.UserLevel; 3776 {
3777 else 3777 if (account.UserLevel > 0)
3778 GodLevel = 200; // local or HG 3778 GodLevel = account.UserLevel;
3779 else
3780 GodLevel = 200;
3781 }
3779 } 3782 }
3780 else 3783 else
3781 { 3784 {