From eedc37794e47159c0f8876ad3e37b69b9448ea98 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 7 Jan 2017 18:49:15 +0000
Subject: rename same more variables to make their meaning more clear

---
 OpenSim/Region/Framework/Scenes/GodController.cs | 4 ++--
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index ac11ba9..0ccb4b6 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -272,12 +272,12 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_userLevel = value; }
         }
 
-        public int GodLevel
+        public int ViwerUIGodLevel
         {
             get { return m_viewergodlevel; }
         }
 
-        public int EffectiveLevel
+        public int GodLevel
         {
             get { return m_godlevel; }
         }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f851179..c38e8fc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2226,7 +2226,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     // let updates be sent,  with some delay
                     m_lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000;
-                    m_lastChildAgentUpdateGodLevel = GodController.GodLevel;
+                    m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel;
                     m_lastChildAgentUpdateDrawDistance = DrawDistance;
                     m_lastChildAgentUpdatePosition = AbsolutePosition;
                     m_childUpdatesBusy = false; // allow them
@@ -4192,7 +4192,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
 
                 bool doUpdate = false;
-                if(m_lastChildAgentUpdateGodLevel != GodController.GodLevel)
+                if(m_lastChildAgentUpdateGodLevel != GodController.ViwerUIGodLevel)
                     doUpdate = true;
                
                 if(!doUpdate && Math.Abs(DrawDistance - m_lastChildAgentUpdateDrawDistance) > 32.0f)
@@ -4209,7 +4209,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_childUpdatesBusy = true;
                     m_lastChildAgentUpdatePosition = pos;
-                    m_lastChildAgentUpdateGodLevel = GodController.GodLevel;
+                    m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel;
                     m_lastChildAgentUpdateDrawDistance = DrawDistance;
 //                        m_lastChildAgentUpdateCamPosition = CameraPosition;
 
-- 
cgit v1.1