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

try to improve option automatic_gods processing

0.9.0-post-fixes
UbitUmarov 2017-01-08 12:30:50 +00:00
parent da69bc5da6
commit 90dee2fce6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Framework/Scenes/GodController.cs
View File

@ -246,17 +246,14 @@ namespace OpenSim.Region.Framework.Scenes
{ {
bool newstate = false; bool newstate = false;
if(m_forceGodModeAlwaysOn) if(m_forceGodModeAlwaysOn)
newstate = true; newstate = m_viewergodlevel >= 200;
else if(state != null)
{ {
if(state != null) OSDMap s = (OSDMap)state;
{
OSDMap s = (OSDMap)state;
if (s.ContainsKey("ViewerUiIsGod")) if (s.ContainsKey("ViewerUiIsGod"))
newstate = s["ViewerUiIsGod"].AsBoolean(); newstate = s["ViewerUiIsGod"].AsBoolean();
m_lastLevelToViewer = m_viewergodlevel; // we are not changing viewer level by default m_lastLevelToViewer = m_viewergodlevel; // we are not changing viewer level by default
}
} }
UpdateGodLevels(newstate); UpdateGodLevels(newstate);
} }
@ -264,6 +261,11 @@ namespace OpenSim.Region.Framework.Scenes
public void HasMovedAway() public void HasMovedAway()
{ {
m_lastLevelToViewer = 0; m_lastLevelToViewer = 0;
if(m_forceGodModeAlwaysOn)
{
m_viewergodlevel = m_rightsGodLevel;
m_godlevel = m_rightsGodLevel;
}
} }
public int UserLevel public int UserLevel