aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins
diff options
context:
space:
mode:
authorUbitUmarov2017-01-07 21:05:12 +0000
committerUbitUmarov2017-01-07 21:05:12 +0000
commit694720d7a98c3864abdb8e5062aa644e432bc1f6 (patch)
tree1e42a0cc41df1d626852e85f0b129e813d6ab315 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins
parentMerge branch 'master' into httptests (diff)
parentCorrect casing on isGod and isViewerUIGod (diff)
downloadopensim-SC-694720d7a98c3864abdb8e5062aa644e432bc1f6.zip
opensim-SC-694720d7a98c3864abdb8e5062aa644e432bc1f6.tar.gz
opensim-SC-694720d7a98c3864abdb8e5062aa644e432bc1f6.tar.bz2
opensim-SC-694720d7a98c3864abdb8e5062aa644e432bc1f6.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index c7e7f89..1808c34 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -540,7 +540,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
540 } 540 }
541 } 541 }
542 542
543 if (presence.IsDeleted || presence.IsChildAgent || presence.GodController.GodLevel > 0.0) 543 if (presence.IsDeleted || presence.IsChildAgent || presence.IsViewerUIGod)
544 return; 544 return;
545 545
546 // if the object the script is in is attached and the avatar is the owner 546 // if the object the script is in is attached and the avatar is the owner