aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c8d28f9..5b86921 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Framework.Scenes
1087 if (account != null) 1087 if (account != null)
1088 UserLevel = account.UserLevel; 1088 UserLevel = account.UserLevel;
1089 1089
1090 if(!isNPC && m_scene.AutomaticGodsOption && m_scene.Permissions != null) 1090 if(!isNPC && m_scene.AutomaticGodsOption)
1091 { 1091 {
1092 if(m_scene.Permissions.IsGod(m_uuid)) 1092 if(m_scene.Permissions.IsGod(m_uuid))
1093 m_godLevel = 200; 1093 m_godLevel = 200;
@@ -4519,8 +4519,8 @@ namespace OpenSim.Region.Framework.Scenes
4519 /// </summary> 4519 /// </summary>
4520 public void GrantGodlikePowers(UUID token, bool godStatus) 4520 public void GrantGodlikePowers(UUID token, bool godStatus)
4521 { 4521 {
4522 if(m_scene.AutomaticGodsOption) 4522// if(m_scene.AutomaticGodsOption)
4523 return; 4523// return;
4524 4524
4525 int oldgodlevel = GodLevel; 4525 int oldgodlevel = GodLevel;
4526 4526
@@ -4580,7 +4580,7 @@ namespace OpenSim.Region.Framework.Scenes
4580 m_pos = cAgentData.Position + offset; 4580 m_pos = cAgentData.Position + offset;
4581 4581
4582 CameraPosition = cAgentData.Center + offset; 4582 CameraPosition = cAgentData.Center + offset;
4583 if(!m_scene.AutomaticGodsOption) 4583// if(!m_scene.AutomaticGodsOption)
4584 { 4584 {
4585 if(cAgentData.GodLevel >= 200 && m_scene.Permissions.IsGod(m_uuid)) 4585 if(cAgentData.GodLevel >= 200 && m_scene.Permissions.IsGod(m_uuid))
4586 GodLevel = cAgentData.GodLevel; 4586 GodLevel = cAgentData.GodLevel;
@@ -4646,7 +4646,7 @@ namespace OpenSim.Region.Framework.Scenes
4646 cAgent.HeadRotation = m_headrotation; 4646 cAgent.HeadRotation = m_headrotation;
4647 cAgent.BodyRotation = Rotation; 4647 cAgent.BodyRotation = Rotation;
4648 cAgent.ControlFlags = (uint)m_AgentControlFlags; 4648 cAgent.ControlFlags = (uint)m_AgentControlFlags;
4649 if(!m_scene.AutomaticGodsOption) 4649// if(!m_scene.AutomaticGodsOption)
4650 { 4650 {
4651 if (GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID)) 4651 if (GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID))
4652 cAgent.GodLevel = (byte)GodLevel; 4652 cAgent.GodLevel = (byte)GodLevel;
@@ -4750,7 +4750,7 @@ namespace OpenSim.Region.Framework.Scenes
4750 Rotation = cAgent.BodyRotation; 4750 Rotation = cAgent.BodyRotation;
4751 m_AgentControlFlags = (AgentManager.ControlFlags)cAgent.ControlFlags; 4751 m_AgentControlFlags = (AgentManager.ControlFlags)cAgent.ControlFlags;
4752 4752
4753 if(!m_scene.AutomaticGodsOption) 4753// if(!m_scene.AutomaticGodsOption)
4754 { 4754 {
4755 if (cAgent.GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID)) 4755 if (cAgent.GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID))
4756 GodLevel = cAgent.GodLevel; 4756 GodLevel = cAgent.GodLevel;