aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
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/Runtime
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-dac9c6fb2360fd46603e08877d57a704eb02e183.zip
opensim-SC-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.gz
opensim-SC-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.bz2
opensim-SC-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 4928e90..6b88834 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -201,9 +201,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
201 m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat); 201 m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat);
202 } 202 }
203 203
204 public void osTeleportAgent(string agent, long regionX, long regionY, vector position, vector lookat) 204 public void osTeleportAgent(string agent, int regionX, int regionY, vector position, vector lookat)
205 { 205 {
206 m_OSSL_Functions.osTeleportAgent(agent, (uint) regionX, (uint) regionY, position, lookat); 206 m_OSSL_Functions.osTeleportAgent(agent, regionX, regionY, position, lookat);
207 } 207 }
208 208
209 public void osTeleportAgent(string agent, vector position, vector lookat) 209 public void osTeleportAgent(string agent, vector position, vector lookat)