diff options
author | Charles Krinke | 2008-09-15 14:32:02 +0000 |
---|---|---|
committer | Charles Krinke | 2008-09-15 14:32:02 +0000 |
commit | 5164fa24110b0197c2d18dc824351d384b1b8582 (patch) | |
tree | c6180377754fb75e812a65bf0cb224e37e107273 /OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | |
parent | Update svn properties, minor formatting cleanup, fix a compiler warning. (diff) | |
download | opensim-SC_OLD-5164fa24110b0197c2d18dc824351d384b1b8582.zip opensim-SC_OLD-5164fa24110b0197c2d18dc824351d384b1b8582.tar.gz opensim-SC_OLD-5164fa24110b0197c2d18dc824351d384b1b8582.tar.bz2 opensim-SC_OLD-5164fa24110b0197c2d18dc824351d384b1b8582.tar.xz |
Mantis#2197. Thank you kindly, Tyre, for a patch that:
adds the new function osTeleportAgent().
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index 1b7cc48..cfc8e94 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | |||
@@ -37,7 +37,7 @@ using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion; | |||
37 | 37 | ||
38 | namespace OpenSim.Region.ScriptEngine.Common | 38 | namespace OpenSim.Region.ScriptEngine.Common |
39 | { | 39 | { |
40 | public class BuiltIn_Commands_BaseClass : MarshalByRefObject, LSL_BuiltIn_Commands_Interface, IScript | 40 | public class BuiltIn_Commands_BaseClass : MarshalByRefObject, LSL_BuiltIn_Commands_Interface, OSSL_BuilIn_Commands_Interface, IScript |
41 | { | 41 | { |
42 | // | 42 | // |
43 | // Included as base for any LSL-script that is compiled. | 43 | // Included as base for any LSL-script that is compiled. |
@@ -1942,6 +1942,18 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1942 | m_LSL_Functions.osSetPrimFloatOnWater(floatYN); | 1942 | m_LSL_Functions.osSetPrimFloatOnWater(floatYN); |
1943 | } | 1943 | } |
1944 | 1944 | ||
1945 | // Teleport Functions | ||
1946 | |||
1947 | public void osTeleportAgent(string agent, string regionName, vector position, vector lookat) | ||
1948 | { | ||
1949 | m_LSL_Functions.osTeleportAgent(agent, regionName, position, lookat); | ||
1950 | } | ||
1951 | |||
1952 | public void osTeleportAgent(string agent, vector position, vector lookat) | ||
1953 | { | ||
1954 | m_LSL_Functions.osTeleportAgent(agent, position, lookat); | ||
1955 | } | ||
1956 | |||
1945 | // Animation Functions | 1957 | // Animation Functions |
1946 | 1958 | ||
1947 | public void osAvatarPlayAnimation(string avatar, string animation) | 1959 | public void osAvatarPlayAnimation(string avatar, string animation) |