diff options
author | Melanie | 2012-02-28 20:51:19 +0100 |
---|---|---|
committer | Melanie | 2012-02-28 20:51:19 +0100 |
commit | f11ab97747652a054c13c6e05de9c49801d1a5c3 (patch) | |
tree | 20e9e2ae9cab2e6adc7f4c864126878567ff2960 | |
parent | Implement llTeleportAgent (diff) | |
download | opensim-SC_OLD-f11ab97747652a054c13c6e05de9c49801d1a5c3.zip opensim-SC_OLD-f11ab97747652a054c13c6e05de9c49801d1a5c3.tar.gz opensim-SC_OLD-f11ab97747652a054c13c6e05de9c49801d1a5c3.tar.bz2 opensim-SC_OLD-f11ab97747652a054c13c6e05de9c49801d1a5c3.tar.xz |
Fix and hook up llTeleportAgent
3 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 78c0d3c..5c02d98 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4657,7 +4657,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4657 | ScriptSleep(5000); | 4657 | ScriptSleep(5000); |
4658 | } | 4658 | } |
4659 | 4659 | ||
4660 | public void llTeleportAgentHome(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt) | 4660 | public void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt) |
4661 | { | 4661 | { |
4662 | m_host.AddScriptLPS(1); | 4662 | m_host.AddScriptLPS(1); |
4663 | UUID agentId = new UUID(); | 4663 | UUID agentId = new UUID(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 99bfc97..5b8c316 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -395,6 +395,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
395 | void llTargetOmega(LSL_Vector axis, double spinrate, double gain); | 395 | void llTargetOmega(LSL_Vector axis, double spinrate, double gain); |
396 | void llTargetRemove(int number); | 396 | void llTargetRemove(int number); |
397 | void llTeleportAgentHome(string agent); | 397 | void llTeleportAgentHome(string agent); |
398 | void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt); | ||
398 | void llTextBox(string avatar, string message, int chat_channel); | 399 | void llTextBox(string avatar, string message, int chat_channel); |
399 | LSL_String llToLower(string source); | 400 | LSL_String llToLower(string source); |
400 | LSL_String llToUpper(string source); | 401 | LSL_String llToUpper(string source); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 9c4437d..1366141 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -1815,6 +1815,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1815 | m_LSL_Functions.llTargetRemove(number); | 1815 | m_LSL_Functions.llTargetRemove(number); |
1816 | } | 1816 | } |
1817 | 1817 | ||
1818 | public void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt) | ||
1819 | { | ||
1820 | m_LSL_Functions.llTeleportAgent(agent, simname, pos, lookAt); | ||
1821 | } | ||
1822 | |||
1818 | public void llTeleportAgentHome(string agent) | 1823 | public void llTeleportAgentHome(string agent) |
1819 | { | 1824 | { |
1820 | m_LSL_Functions.llTeleportAgentHome(agent); | 1825 | m_LSL_Functions.llTeleportAgentHome(agent); |