rename same more variables to make their meaning more clear

melanie
UbitUmarov 2017-01-07 18:49:15 +00:00
parent effa32cfa4
commit eedc37794e
2 changed files with 5 additions and 5 deletions

View File

@ -272,12 +272,12 @@ namespace OpenSim.Region.Framework.Scenes
set { m_userLevel = value; } set { m_userLevel = value; }
} }
public int GodLevel public int ViwerUIGodLevel
{ {
get { return m_viewergodlevel; } get { return m_viewergodlevel; }
} }
public int EffectiveLevel public int GodLevel
{ {
get { return m_godlevel; } get { return m_godlevel; }
} }

View File

@ -2226,7 +2226,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
// let updates be sent, with some delay // let updates be sent, with some delay
m_lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; m_lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000;
m_lastChildAgentUpdateGodLevel = GodController.GodLevel; m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel;
m_lastChildAgentUpdateDrawDistance = DrawDistance; m_lastChildAgentUpdateDrawDistance = DrawDistance;
m_lastChildAgentUpdatePosition = AbsolutePosition; m_lastChildAgentUpdatePosition = AbsolutePosition;
m_childUpdatesBusy = false; // allow them m_childUpdatesBusy = false; // allow them
@ -4192,7 +4192,7 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
bool doUpdate = false; bool doUpdate = false;
if(m_lastChildAgentUpdateGodLevel != GodController.GodLevel) if(m_lastChildAgentUpdateGodLevel != GodController.ViwerUIGodLevel)
doUpdate = true; doUpdate = true;
if(!doUpdate && Math.Abs(DrawDistance - m_lastChildAgentUpdateDrawDistance) > 32.0f) if(!doUpdate && Math.Abs(DrawDistance - m_lastChildAgentUpdateDrawDistance) > 32.0f)
@ -4209,7 +4209,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_childUpdatesBusy = true; m_childUpdatesBusy = true;
m_lastChildAgentUpdatePosition = pos; m_lastChildAgentUpdatePosition = pos;
m_lastChildAgentUpdateGodLevel = GodController.GodLevel; m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel;
m_lastChildAgentUpdateDrawDistance = DrawDistance; m_lastChildAgentUpdateDrawDistance = DrawDistance;
// m_lastChildAgentUpdateCamPosition = CameraPosition; // m_lastChildAgentUpdateCamPosition = CameraPosition;