diff options
author | UbitUmarov | 2017-01-07 18:49:15 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-07 18:49:15 +0000 |
commit | eedc37794e47159c0f8876ad3e37b69b9448ea98 (patch) | |
tree | 0dd0fa40552d5298d3ea6bfad6a196456302a0cc /OpenSim/Region/Framework/Scenes | |
parent | replace godlevel compares by the new faster bool isViewerUIGod (diff) | |
download | opensim-SC_OLD-eedc37794e47159c0f8876ad3e37b69b9448ea98.zip opensim-SC_OLD-eedc37794e47159c0f8876ad3e37b69b9448ea98.tar.gz opensim-SC_OLD-eedc37794e47159c0f8876ad3e37b69b9448ea98.tar.bz2 opensim-SC_OLD-eedc37794e47159c0f8876ad3e37b69b9448ea98.tar.xz |
rename same more variables to make their meaning more clear
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/GodController.cs | 4 | ||||
-rw-r--r-- | 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 | |||
272 | set { m_userLevel = value; } | 272 | set { m_userLevel = value; } |
273 | } | 273 | } |
274 | 274 | ||
275 | public int GodLevel | 275 | public int ViwerUIGodLevel |
276 | { | 276 | { |
277 | get { return m_viewergodlevel; } | 277 | get { return m_viewergodlevel; } |
278 | } | 278 | } |
279 | 279 | ||
280 | public int EffectiveLevel | 280 | public int GodLevel |
281 | { | 281 | { |
282 | get { return m_godlevel; } | 282 | get { return m_godlevel; } |
283 | } | 283 | } |
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 | |||
2226 | } | 2226 | } |
2227 | // let updates be sent, with some delay | 2227 | // let updates be sent, with some delay |
2228 | m_lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; | 2228 | m_lastChildUpdatesTime = Util.EnvironmentTickCount() + 10000; |
2229 | m_lastChildAgentUpdateGodLevel = GodController.GodLevel; | 2229 | m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel; |
2230 | m_lastChildAgentUpdateDrawDistance = DrawDistance; | 2230 | m_lastChildAgentUpdateDrawDistance = DrawDistance; |
2231 | m_lastChildAgentUpdatePosition = AbsolutePosition; | 2231 | m_lastChildAgentUpdatePosition = AbsolutePosition; |
2232 | m_childUpdatesBusy = false; // allow them | 2232 | m_childUpdatesBusy = false; // allow them |
@@ -4192,7 +4192,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4192 | return; | 4192 | return; |
4193 | 4193 | ||
4194 | bool doUpdate = false; | 4194 | bool doUpdate = false; |
4195 | if(m_lastChildAgentUpdateGodLevel != GodController.GodLevel) | 4195 | if(m_lastChildAgentUpdateGodLevel != GodController.ViwerUIGodLevel) |
4196 | doUpdate = true; | 4196 | doUpdate = true; |
4197 | 4197 | ||
4198 | if(!doUpdate && Math.Abs(DrawDistance - m_lastChildAgentUpdateDrawDistance) > 32.0f) | 4198 | if(!doUpdate && Math.Abs(DrawDistance - m_lastChildAgentUpdateDrawDistance) > 32.0f) |
@@ -4209,7 +4209,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4209 | { | 4209 | { |
4210 | m_childUpdatesBusy = true; | 4210 | m_childUpdatesBusy = true; |
4211 | m_lastChildAgentUpdatePosition = pos; | 4211 | m_lastChildAgentUpdatePosition = pos; |
4212 | m_lastChildAgentUpdateGodLevel = GodController.GodLevel; | 4212 | m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel; |
4213 | m_lastChildAgentUpdateDrawDistance = DrawDistance; | 4213 | m_lastChildAgentUpdateDrawDistance = DrawDistance; |
4214 | // m_lastChildAgentUpdateCamPosition = CameraPosition; | 4214 | // m_lastChildAgentUpdateCamPosition = CameraPosition; |
4215 | 4215 | ||