diff options
| author | UbitUmarov | 2017-01-07 18:57:12 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-07 18:57:12 +0000 |
| commit | 1b858ad47b2bb12cf095a2259db97381b295e464 (patch) | |
| tree | 3457205686326bf09d97cc820f0ccc3ed7bd5ffb /OpenSim | |
| parent | rename same more variables to make their meaning more clear (diff) | |
| download | opensim-SC-1b858ad47b2bb12cf095a2259db97381b295e464.zip opensim-SC-1b858ad47b2bb12cf095a2259db97381b295e464.tar.gz opensim-SC-1b858ad47b2bb12cf095a2259db97381b295e464.tar.bz2 opensim-SC-1b858ad47b2bb12cf095a2259db97381b295e464.tar.xz | |
missing changed file
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 9664ae5..904c8c8 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
| @@ -194,14 +194,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
| 194 | int godlevel = 200; | 194 | int godlevel = 200; |
| 195 | // update level so higher gods can kick lower ones | 195 | // update level so higher gods can kick lower ones |
| 196 | ScenePresence god = m_scene.GetScenePresence(godID); | 196 | ScenePresence god = m_scene.GetScenePresence(godID); |
| 197 | if(god != null && god.GodController.EffectiveLevel > godlevel) | 197 | if(god != null && god.GodController.GodLevel > godlevel) |
| 198 | godlevel = god.GodController.EffectiveLevel; | 198 | godlevel = god.GodController.GodLevel; |
| 199 | 199 | ||
| 200 | if(agentID == ALL_AGENTS) | 200 | if(agentID == ALL_AGENTS) |
| 201 | { | 201 | { |
| 202 | m_scene.ForEachRootScenePresence(delegate(ScenePresence p) | 202 | m_scene.ForEachRootScenePresence(delegate(ScenePresence p) |
| 203 | { | 203 | { |
| 204 | if (p.UUID != godID && godlevel > p.GodController.EffectiveLevel) | 204 | if (p.UUID != godID && godlevel > p.GodController.GodLevel) |
| 205 | doKickmodes(godID, p, kickflags, reason); | 205 | doKickmodes(godID, p, kickflags, reason); |
| 206 | }); | 206 | }); |
| 207 | return; | 207 | return; |
| @@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
| 224 | return; | 224 | return; |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | if (godlevel <= sp.GodController.EffectiveLevel) // no god wars | 227 | if (godlevel <= sp.GodController.GodLevel) // no god wars |
| 228 | return; | 228 | return; |
| 229 | 229 | ||
| 230 | if(sp.UUID == godID) | 230 | if(sp.UUID == godID) |