diff options
| author | Melanie Thielker | 2014-08-11 18:45:39 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-11 18:45:39 +0200 |
| commit | 22d472e34a8f789fdefc2bf7f0d6e859f8f83303 (patch) | |
| tree | fa73dec548fb0a83170865b2ae08d602789b99c3 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'avination-current' (diff) | |
| parent | remove a land.SendLandUpdateToClient() since its now done for all cases in (diff) | |
| download | opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.zip opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.tar.gz opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.tar.bz2 opensim-SC-22d472e34a8f789fdefc2bf7f0d6e859f8f83303.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 11 |
1 files changed, 10 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 181399d..7bfe27b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
| @@ -549,7 +549,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
| 549 | return; | 549 | return; |
| 550 | 550 | ||
| 551 | toRegionPos = presence.AbsolutePosition; | 551 | toRegionPos = presence.AbsolutePosition; |
| 552 | dis = Math.Abs(Util.GetDistanceTo(toRegionPos, fromRegionPos)); | 552 | dis = Util.GetDistanceTo(toRegionPos, fromRegionPos); |
| 553 | if (presence.IsSatOnObject && presence.ParentPart != null && | ||
| 554 | presence.ParentPart.ParentGroup != null && | ||
| 555 | presence.ParentPart.ParentGroup.RootPart != null) | ||
| 556 | { | ||
| 557 | Vector3 rpos = presence.ParentPart.ParentGroup.RootPart.AbsolutePosition; | ||
| 558 | double dis2 = Util.GetDistanceTo(rpos, fromRegionPos); | ||
| 559 | if (dis > dis2) | ||
| 560 | dis = dis2; | ||
| 561 | } | ||
| 553 | 562 | ||
| 554 | // Disabled for now since all osNpc* methods check for appropriate ownership permission. | 563 | // Disabled for now since all osNpc* methods check for appropriate ownership permission. |
| 555 | // Perhaps could be re-enabled as an NPC setting at some point since being able to make NPCs not | 564 | // Perhaps could be re-enabled as an NPC setting at some point since being able to make NPCs not |