aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-25 14:13:51 -0500
committerTeravus Ovares (Dan Olivares)2009-11-25 14:13:51 -0500
commitdac9c6fb2360fd46603e08877d57a704eb02e183 (patch)
tree614ef8a4851d69a3fb3a76c7839ef576c234b6e7 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
parentPatch: Fix a bug in LAND animation when the TickCount wraps into negative num... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.zip
opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.gz
opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.bz2
opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 2a403bf..470946a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
83 83
84 // Teleport commands 84 // Teleport commands
85 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 85 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
86 void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 86 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
87 void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 87 void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
88 88
89 // Animation commands 89 // Animation commands