diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 7bfe27b..d401ed8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -351,7 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
351 | // your head but the sensor will stay with your (global) | 351 | // your head but the sensor will stay with your (global) |
352 | // avatar rotation and position. | 352 | // avatar rotation and position. |
353 | // Position of a sensor in a child prim attached to an avatar | 353 | // Position of a sensor in a child prim attached to an avatar |
354 | // will be still wrong. | 354 | // will be still wrong. |
355 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); | 355 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); |
356 | 356 | ||
357 | // Don't proceed if the avatar for this attachment has since been removed from the scene. | 357 | // Don't proceed if the avatar for this attachment has since been removed from the scene. |
@@ -473,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
473 | 473 | ||
474 | SceneObjectPart SensePoint = ts.host; | 474 | SceneObjectPart SensePoint = ts.host; |
475 | Vector3 fromRegionPos = SensePoint.GetWorldPosition(); | 475 | Vector3 fromRegionPos = SensePoint.GetWorldPosition(); |
476 | 476 | ||
477 | Quaternion q = SensePoint.GetWorldRotation(); | 477 | Quaternion q = SensePoint.GetWorldRotation(); |
478 | if (SensePoint.ParentGroup.IsAttachment) | 478 | if (SensePoint.ParentGroup.IsAttachment) |
479 | { | 479 | { |
@@ -486,7 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
486 | // your head but the sensor will stay with your (global) | 486 | // your head but the sensor will stay with your (global) |
487 | // avatar rotation and position. | 487 | // avatar rotation and position. |
488 | // Position of a sensor in a child prim attached to an avatar | 488 | // Position of a sensor in a child prim attached to an avatar |
489 | // will be still wrong. | 489 | // will be still wrong. |
490 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); | 490 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); |
491 | 491 | ||
492 | // Don't proceed if the avatar for this attachment has since been removed from the scene. | 492 | // Don't proceed if the avatar for this attachment has since been removed from the scene. |
@@ -502,7 +502,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
502 | bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0); | 502 | bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0); |
503 | Vector3 toRegionPos; | 503 | Vector3 toRegionPos; |
504 | double dis; | 504 | double dis; |
505 | 505 | ||
506 | Action<ScenePresence> senseEntity = new Action<ScenePresence>(presence => | 506 | Action<ScenePresence> senseEntity = new Action<ScenePresence>(presence => |
507 | { | 507 | { |
508 | // m_log.DebugFormat( | 508 | // m_log.DebugFormat( |
@@ -542,7 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
542 | 542 | ||
543 | if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0) | 543 | if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0) |
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 |
547 | // then this one is not wanted | 547 | // then this one is not wanted |
548 | if (attached && presence.UUID == SensePoint.OwnerID) | 548 | if (attached && presence.UUID == SensePoint.OwnerID) |
@@ -700,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
700 | DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); | 700 | DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); |
701 | 701 | ||
702 | AddSenseRepeater(ts); | 702 | AddSenseRepeater(ts); |
703 | 703 | ||
704 | idx += 6; | 704 | idx += 6; |
705 | } | 705 | } |
706 | } | 706 | } |
@@ -716,6 +716,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
716 | } | 716 | } |
717 | 717 | ||
718 | return retList; | 718 | return retList; |
719 | } | 719 | } |
720 | } | 720 | } |
721 | } | 721 | } |