OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow initial automatic level to be changed by request. Since viewers still dont get real level, one will need to ask for god level then disable it to syncronize the viewer with real level.

melanie
UbitUmarov 2017-01-05 21:32:26 +00:00
parent 1fb01a0099
commit 83c9776cbc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Framework.Scenes
if (account != null) if (account != null)
UserLevel = account.UserLevel; UserLevel = account.UserLevel;
if(!isNPC && m_scene.AutomaticGodsOption && m_scene.Permissions != null) if(!isNPC && m_scene.AutomaticGodsOption)
{ {
if(m_scene.Permissions.IsGod(m_uuid)) if(m_scene.Permissions.IsGod(m_uuid))
m_godLevel = 200; m_godLevel = 200;
@ -4519,8 +4519,8 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void GrantGodlikePowers(UUID token, bool godStatus) public void GrantGodlikePowers(UUID token, bool godStatus)
{ {
if(m_scene.AutomaticGodsOption) // if(m_scene.AutomaticGodsOption)
return; // return;
int oldgodlevel = GodLevel; int oldgodlevel = GodLevel;
@ -4580,7 +4580,7 @@ namespace OpenSim.Region.Framework.Scenes
m_pos = cAgentData.Position + offset; m_pos = cAgentData.Position + offset;
CameraPosition = cAgentData.Center + offset; CameraPosition = cAgentData.Center + offset;
if(!m_scene.AutomaticGodsOption) // if(!m_scene.AutomaticGodsOption)
{ {
if(cAgentData.GodLevel >= 200 && m_scene.Permissions.IsGod(m_uuid)) if(cAgentData.GodLevel >= 200 && m_scene.Permissions.IsGod(m_uuid))
GodLevel = cAgentData.GodLevel; GodLevel = cAgentData.GodLevel;
@ -4646,7 +4646,7 @@ namespace OpenSim.Region.Framework.Scenes
cAgent.HeadRotation = m_headrotation; cAgent.HeadRotation = m_headrotation;
cAgent.BodyRotation = Rotation; cAgent.BodyRotation = Rotation;
cAgent.ControlFlags = (uint)m_AgentControlFlags; cAgent.ControlFlags = (uint)m_AgentControlFlags;
if(!m_scene.AutomaticGodsOption) // if(!m_scene.AutomaticGodsOption)
{ {
if (GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID)) if (GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID))
cAgent.GodLevel = (byte)GodLevel; cAgent.GodLevel = (byte)GodLevel;
@ -4750,7 +4750,7 @@ namespace OpenSim.Region.Framework.Scenes
Rotation = cAgent.BodyRotation; Rotation = cAgent.BodyRotation;
m_AgentControlFlags = (AgentManager.ControlFlags)cAgent.ControlFlags; m_AgentControlFlags = (AgentManager.ControlFlags)cAgent.ControlFlags;
if(!m_scene.AutomaticGodsOption) // if(!m_scene.AutomaticGodsOption)
{ {
if (cAgent.GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID)) if (cAgent.GodLevel >= 200 && m_scene.Permissions.IsGod(cAgent.AgentID))
GodLevel = cAgent.GodLevel; GodLevel = cAgent.GodLevel;