diff options
| author | root | 2009-11-26 20:41:38 +0100 |
|---|---|---|
| committer | root | 2009-11-26 20:41:38 +0100 |
| commit | 2c3f6aaa878b5458eeeab8544226ff53b7172f5a (patch) | |
| tree | 48941505962693508016fafb479c2baaf1b3568f /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | First attempt at mult-sit on large single prims. (diff) | |
| parent | Remove OS version crap from about dialog (diff) | |
| download | opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.zip opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.gz opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.bz2 opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.xz | |
Merge branch 'careminster' into tests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 3 |
1 files changed, 2 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..0b0dc00 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 |
| @@ -162,5 +162,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 162 | 162 | ||
| 163 | key osGetMapTexture(); | 163 | key osGetMapTexture(); |
| 164 | key osGetRegionMapTexture(string regionName); | 164 | key osGetRegionMapTexture(string regionName); |
| 165 | LSL_List osGetRegionStats(); | ||
| 165 | } | 166 | } |
| 166 | } | 167 | } |