diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
2 files changed, 7 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 b9defbe..c9998c0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2109,14 +2109,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
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 | NotImplemented("llRotTarget"); | 2112 | return m_host.registerRotTargetWaypoint(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), (float)error); |
2113 | return 0; | ||
2114 | } | 2113 | } |
2115 | 2114 | ||
2116 | public void llRotTargetRemove(int number) | 2115 | public void llRotTargetRemove(int number) |
2117 | { | 2116 | { |
2118 | m_host.AddScriptLPS(1); | 2117 | m_host.AddScriptLPS(1); |
2119 | NotImplemented("llRotTargetRemove"); | 2118 | m_host.unregisterRotTargetWaypoint(number); |
2120 | } | 2119 | } |
2121 | 2120 | ||
2122 | public void llMoveToTarget(LSL_Vector target, double tau) | 2121 | public void llMoveToTarget(LSL_Vector target, double tau) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index d8b9159..2c8b0ea 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1983,6 +1983,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1983 | 1983 | ||
1984 | return (int)pws; | 1984 | return (int)pws; |
1985 | } | 1985 | } |
1986 | |||
1986 | public void osSetSpeed(string UUID, float SpeedModifier) | 1987 | public void osSetSpeed(string UUID, float SpeedModifier) |
1987 | { | 1988 | { |
1988 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); | 1989 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); |
@@ -1990,6 +1991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1990 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); | 1991 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); |
1991 | avatar.SpeedModifier = SpeedModifier; | 1992 | avatar.SpeedModifier = SpeedModifier; |
1992 | } | 1993 | } |
1994 | |||
1993 | public void osKickAvatar(string FirstName,string SurName,string alert) | 1995 | public void osKickAvatar(string FirstName,string SurName,string alert) |
1994 | { | 1996 | { |
1995 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); | 1997 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); |
@@ -2010,6 +2012,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2010 | } | 2012 | } |
2011 | } | 2013 | } |
2012 | } | 2014 | } |
2015 | |||
2013 | public void osCauseDamage(string avatar, double damage) | 2016 | public void osCauseDamage(string avatar, double damage) |
2014 | { | 2017 | { |
2015 | CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); | 2018 | CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); |
@@ -2037,6 +2040,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2037 | } | 2040 | } |
2038 | } | 2041 | } |
2039 | } | 2042 | } |
2043 | |||
2040 | public void osCauseHealing(string avatar, double healing) | 2044 | public void osCauseHealing(string avatar, double healing) |
2041 | { | 2045 | { |
2042 | CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); | 2046 | CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); |
@@ -2061,4 +2065,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2061 | } | 2065 | } |
2062 | } | 2066 | } |
2063 | } | 2067 | } |
2064 | } | 2068 | } \ No newline at end of file |