Merge branch 'careminster' into casper

author: CasperW 2009-11-26 02:01:51 +0100
committer: CasperW 2009-11-26 02:01:51 +0100
commit: de551102472780b21ccd6cf82fb6838cf4f175ce (patch)
tree: 4ad56f9766ae4b0bd702fa0f0d3211cf216e14d4 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
parent: Add nudge right and left to avatar movement (faster reaction times when stepp... (diff)
parent: Add the dummy "Size" property to the list type (diff)
download: opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.zip
opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.tar.gz
opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.tar.bz2
opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.tar.xz
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
        // Teleport commands
        void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
-        void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
+        void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
        void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
        // Animation commands
author	CasperW	2009-11-26 02:01:51 +0100
committer	CasperW	2009-11-26 02:01:51 +0100
commit	de551102472780b21ccd6cf82fb6838cf4f175ce (patch)
tree	4ad56f9766ae4b0bd702fa0f0d3211cf216e14d4 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
parent	Add nudge right and left to avatar movement (faster reaction times when stepp... (diff)
parent	Add the dummy "Size" property to the list type (diff)
download	opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.zip opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.tar.gz opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.tar.bz2 opensim-SC_OLD-de551102472780b21ccd6cf82fb6838cf4f175ce.tar.xz

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