diff options
| author | Justin Clark-Casey (justincc) | 2010-11-16 19:18:43 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-11-16 19:18:43 +0000 |
| commit | c5d78c723b0965b196ba22224e4bf56696ea96f5 (patch) | |
| tree | d47ff745be7d74a43d322ad3884fddea7d03732b /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Do not include hyperlinks in a random region search during a login. (diff) | |
| parent | Fix osTeleportAgent for hypergrid destinations. (diff) | |
| download | opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.zip opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.tar.gz opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.tar.bz2 opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 630821b..c9a24f6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -86,6 +86,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 86 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 86 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
| 87 | void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 87 | void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
| 88 | void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 88 | void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
| 89 | void osTeleportOwner(string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | ||
| 90 | void osTeleportOwner(int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | ||
| 91 | void osTeleportOwner(LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | ||
| 89 | 92 | ||
| 90 | // Animation commands | 93 | // Animation commands |
| 91 | void osAvatarPlayAnimation(string avatar, string animation); | 94 | void osAvatarPlayAnimation(string avatar, string animation); |