diff options
author | Melanie | 2010-01-11 02:04:05 +0000 |
---|---|---|
committer | Melanie | 2010-01-11 02:04:05 +0000 |
commit | 2320b17ca92d0c922d78ad72933fe3903f2108d0 (patch) | |
tree | d35df47cc980f6f60205c9039130df271d6e9334 /OpenSim/Region/ScriptEngine | |
parent | Adds llRotTarget and the events at_rot_target and not_at_rot_target. (diff) | |
download | opensim-SC-2320b17ca92d0c922d78ad72933fe3903f2108d0.zip opensim-SC-2320b17ca92d0c922d78ad72933fe3903f2108d0.tar.gz opensim-SC-2320b17ca92d0c922d78ad72933fe3903f2108d0.tar.bz2 opensim-SC-2320b17ca92d0c922d78ad72933fe3903f2108d0.tar.xz |
Whitespace cleanup
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
3 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 856f8b6..1985e72 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2108,13 +2108,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2108 | 2108 | ||
2109 | public LSL_Integer llRotTarget(LSL_Rotation rot, double error) | 2109 | public LSL_Integer llRotTarget(LSL_Rotation rot, double error) |
2110 | { | 2110 | { |
2111 | m_host.AddScriptLPS(1); | 2111 | m_host.AddScriptLPS(1); |
2112 | return m_host.registerRotTargetWaypoint(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), (float)error); | 2112 | return m_host.registerRotTargetWaypoint(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), (float)error); |
2113 | } | 2113 | } |
2114 | 2114 | ||
2115 | public void llRotTargetRemove(int number) | 2115 | public void llRotTargetRemove(int number) |
2116 | { | 2116 | { |
2117 | m_host.AddScriptLPS(1); | 2117 | m_host.AddScriptLPS(1); |
2118 | m_host.unregisterRotTargetWaypoint(number); | 2118 | m_host.unregisterRotTargetWaypoint(number); |
2119 | } | 2119 | } |
2120 | 2120 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index fb86850..9615315 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
61 | land_collision = 2048, | 61 | land_collision = 2048, |
62 | land_collision_end = 4096, | 62 | land_collision_end = 4096, |
63 | land_collision_start = 8192, | 63 | land_collision_start = 8192, |
64 | at_target = 16384, | 64 | at_target = 16384, |
65 | at_rot_target = 16777216, | 65 | at_rot_target = 16777216, |
66 | listen = 32768, | 66 | listen = 32768, |
67 | money = 65536, | 67 | money = 65536, |
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
203 | return; | 203 | return; |
204 | } | 204 | } |
205 | 205 | ||
206 | m_eventFlagsMap.Add("attach", scriptEvents.attach); | 206 | m_eventFlagsMap.Add("attach", scriptEvents.attach); |
207 | m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target); | 207 | m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target); |
208 | m_eventFlagsMap.Add("at_target", scriptEvents.at_target); | 208 | m_eventFlagsMap.Add("at_target", scriptEvents.at_target); |
209 | // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed); | 209 | // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed); |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index ce22ba5..16309ef 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -58,9 +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; | 62 | myScriptEngine.World.EventManager.OnScriptAtRotTargetEvent += at_rot_target; |
63 | myScriptEngine.World.EventManager.OnScriptNotAtRotTargetEvent += not_at_rot_target; | 63 | myScriptEngine.World.EventManager.OnScriptNotAtRotTargetEvent += not_at_rot_target; |
64 | myScriptEngine.World.EventManager.OnScriptControlEvent += control; | 64 | myScriptEngine.World.EventManager.OnScriptControlEvent += control; |
65 | myScriptEngine.World.EventManager.OnScriptColliderStart += collision_start; | 65 | myScriptEngine.World.EventManager.OnScriptColliderStart += collision_start; |
66 | myScriptEngine.World.EventManager.OnScriptColliding += collision; | 66 | myScriptEngine.World.EventManager.OnScriptColliding += collision; |
@@ -390,16 +390,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
390 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 390 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
391 | "not_at_target",new object[0], | 391 | "not_at_target",new object[0], |
392 | new DetectParams[0])); | 392 | new DetectParams[0])); |
393 | } | 393 | } |
394 | 394 | ||
395 | public void at_rot_target(uint localID, uint handle, Quaternion targetrot, | 395 | public void at_rot_target(uint localID, uint handle, Quaternion targetrot, |
396 | Quaternion atrot) | 396 | Quaternion atrot) |
397 | { | 397 | { |
398 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 398 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
399 | "at_rot_target", new object[] { | 399 | "at_rot_target", new object[] { |
400 | new LSL_Types.LSLInteger(handle), | 400 | new LSL_Types.LSLInteger(handle), |
401 | new LSL_Types.Quaternion(targetrot.X,targetrot.Y,targetrot.Z,targetrot.W), | 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) }, | 402 | new LSL_Types.Quaternion(atrot.X,atrot.Y,atrot.Z,atrot.W) }, |
403 | new DetectParams[0])); | 403 | new DetectParams[0])); |
404 | } | 404 | } |
405 | 405 | ||