aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2010-01-11 02:04:05 +0000
committerMelanie2010-01-11 02:04:05 +0000
commit2320b17ca92d0c922d78ad72933fe3903f2108d0 (patch)
treed35df47cc980f6f60205c9039130df271d6e9334 /OpenSim/Region/ScriptEngine/Shared
parentAdds llRotTarget and the events at_rot_target and not_at_rot_target. (diff)
downloadopensim-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/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs4
2 files changed, 4 insertions, 4 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);