diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Region/ScriptEngine | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index b710229..8093502 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2110,7 +2110,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2110 | if (module != null) | 2110 | if (module != null) |
| 2111 | { | 2111 | { |
| 2112 | Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z); | 2112 | Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z); |
| 2113 | module.Autopilot(new UUID(npc.m_string), World, pos); | 2113 | module.MoveToTarget(new UUID(npc.m_string), World, pos); |
| 2114 | } | 2114 | } |
| 2115 | } | 2115 | } |
| 2116 | 2116 | ||