diff options
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 92e33b8..42c52dd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2214,13 +2214,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2214 | 2214 | ||
2215 | public LSL_Integer llRotTarget(LSL_Rotation rot, double error) | 2215 | public LSL_Integer llRotTarget(LSL_Rotation rot, double error) |
2216 | { | 2216 | { |
2217 | m_host.AddScriptLPS(1); | 2217 | m_host.AddScriptLPS(1); |
2218 | return m_host.registerRotTargetWaypoint(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), (float)error); | 2218 | return m_host.registerRotTargetWaypoint(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), (float)error); |
2219 | } | 2219 | } |
2220 | 2220 | ||
2221 | public void llRotTargetRemove(int number) | 2221 | public void llRotTargetRemove(int number) |
2222 | { | 2222 | { |
2223 | m_host.AddScriptLPS(1); | 2223 | m_host.AddScriptLPS(1); |
2224 | m_host.unregisterRotTargetWaypoint(number); | 2224 | m_host.unregisterRotTargetWaypoint(number); |
2225 | } | 2225 | } |
2226 | 2226 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 3456a3c..943d7a2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
62 | land_collision = 2048, | 62 | land_collision = 2048, |
63 | land_collision_end = 4096, | 63 | land_collision_end = 4096, |
64 | land_collision_start = 8192, | 64 | land_collision_start = 8192, |
65 | at_target = 16384, | 65 | at_target = 16384, |
66 | at_rot_target = 16777216, | 66 | at_rot_target = 16777216, |
67 | listen = 32768, | 67 | listen = 32768, |
68 | money = 65536, | 68 | money = 65536, |
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
205 | return; | 205 | return; |
206 | } | 206 | } |
207 | 207 | ||
208 | m_eventFlagsMap.Add("attach", scriptEvents.attach); | 208 | m_eventFlagsMap.Add("attach", scriptEvents.attach); |
209 | m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target); | 209 | m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target); |
210 | m_eventFlagsMap.Add("at_target", scriptEvents.at_target); | 210 | m_eventFlagsMap.Add("at_target", scriptEvents.at_target); |
211 | // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed); | 211 | // 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 | ||