diff options
author | Revolution | 2010-01-10 20:20:00 -0600 |
---|---|---|
committer | Melanie | 2010-01-11 02:00:40 +0000 |
commit | a0859754c03324be9a4a2b9c9f26928e64cb5a6f (patch) | |
tree | de452818c3a8bae329760d3012e07c467479845b /OpenSim/Region/ScriptEngine/XEngine | |
parent | Clean CRs from previous patch (diff) | |
download | opensim-SC-a0859754c03324be9a4a2b9c9f26928e64cb5a6f.zip opensim-SC-a0859754c03324be9a4a2b9c9f26928e64cb5a6f.tar.gz opensim-SC-a0859754c03324be9a4a2b9c9f26928e64cb5a6f.tar.bz2 opensim-SC-a0859754c03324be9a4a2b9c9f26928e64cb5a6f.tar.xz |
Adds llRotTarget and the events at_rot_target and not_at_rot_target.
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index b2eab45..ce22ba5 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -58,7 +58,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
58 | myScriptEngine.World.EventManager.OnObjectDeGrab += touch_end; | 58 | myScriptEngine.World.EventManager.OnObjectDeGrab += touch_end; |
59 | myScriptEngine.World.EventManager.OnScriptChangedEvent += changed; | 59 | myScriptEngine.World.EventManager.OnScriptChangedEvent += changed; |
60 | myScriptEngine.World.EventManager.OnScriptAtTargetEvent += at_target; | 60 | myScriptEngine.World.EventManager.OnScriptAtTargetEvent += at_target; |
61 | myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target; | 61 | myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target; |
62 | myScriptEngine.World.EventManager.OnScriptAtRotTargetEvent += at_rot_target; | ||
63 | myScriptEngine.World.EventManager.OnScriptNotAtRotTargetEvent += not_at_rot_target; | ||
62 | myScriptEngine.World.EventManager.OnScriptControlEvent += control; | 64 | myScriptEngine.World.EventManager.OnScriptControlEvent += control; |
63 | myScriptEngine.World.EventManager.OnScriptColliderStart += collision_start; | 65 | myScriptEngine.World.EventManager.OnScriptColliderStart += collision_start; |
64 | myScriptEngine.World.EventManager.OnScriptColliding += collision; | 66 | myScriptEngine.World.EventManager.OnScriptColliding += collision; |
@@ -388,16 +390,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
388 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 390 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
389 | "not_at_target",new object[0], | 391 | "not_at_target",new object[0], |
390 | new DetectParams[0])); | 392 | new DetectParams[0])); |
391 | } | 393 | } |
392 | 394 | ||
393 | public void at_rot_target(uint localID, UUID itemID) | 395 | public void at_rot_target(uint localID, uint handle, Quaternion targetrot, |
394 | { | 396 | Quaternion atrot) |
395 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 397 | { |
396 | "at_rot_target",new object[0], | 398 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
399 | "at_rot_target", new object[] { | ||
400 | new LSL_Types.LSLInteger(handle), | ||
401 | new LSL_Types.Quaternion(targetrot.X,targetrot.Y,targetrot.Z,targetrot.W), | ||
402 | new LSL_Types.Quaternion(atrot.X,atrot.Y,atrot.Z,atrot.W) }, | ||
397 | new DetectParams[0])); | 403 | new DetectParams[0])); |
398 | } | 404 | } |
399 | 405 | ||
400 | public void not_at_rot_target(uint localID, UUID itemID) | 406 | public void not_at_rot_target(uint localID) |
401 | { | 407 | { |
402 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 408 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
403 | "not_at_rot_target",new object[0], | 409 | "not_at_rot_target",new object[0], |