aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorMelanie2010-01-11 02:04:58 +0000
committerMelanie2010-01-11 02:04:58 +0000
commit649d45a2d484f92765699920faf528891aba22a9 (patch)
treea464685ab19c0c6a358e37e87787b1c7ab1bee08 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentMerge branch 'master' into careminster (diff)
parentWhitespace cleanup (diff)
downloadopensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.zip
opensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.tar.gz
opensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.tar.bz2
opensim-SC_OLD-649d45a2d484f92765699920faf528891aba22a9.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 2 insertions, 2 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