diff options
author | Dan Lake | 2011-09-21 16:24:48 -0700 |
---|---|---|
committer | Dan Lake | 2011-09-21 16:24:48 -0700 |
commit | 28a482a7ee2cebab1aa720477af175d7e26d702e (patch) | |
tree | 863fb4b43a571da4d1d963b5a1383538e6391ec8 /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |
parent | Commented out new debug statements in ScenePresence (diff) | |
parent | Reinstate option to land an npc when it reaches a target. (diff) | |
download | opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.zip opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.gz opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.bz2 opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 31e79fa..edb618e 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -37,11 +37,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
37 | { | 37 | { |
38 | public class NPCAvatar : IClientAPI | 38 | public class NPCAvatar : IClientAPI |
39 | { | 39 | { |
40 | /// <summary> | ||
41 | /// Signal whether the avatar should land when it reaches a move target | ||
42 | /// </summary> | ||
43 | public bool LandAtTarget { get; set; } | ||
44 | |||
45 | private readonly string m_firstname; | 40 | private readonly string m_firstname; |
46 | private readonly string m_lastname; | 41 | private readonly string m_lastname; |
47 | private readonly Vector3 m_startPos; | 42 | private readonly Vector3 m_startPos; |
@@ -333,7 +328,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
333 | public event ScriptReset OnScriptReset; | 328 | public event ScriptReset OnScriptReset; |
334 | public event GetScriptRunning OnGetScriptRunning; | 329 | public event GetScriptRunning OnGetScriptRunning; |
335 | public event SetScriptRunning OnSetScriptRunning; | 330 | public event SetScriptRunning OnSetScriptRunning; |
336 | public event Action<Vector3, bool> OnAutoPilotGo; | 331 | public event Action<Vector3, bool, bool> OnAutoPilotGo; |
337 | 332 | ||
338 | public event TerrainUnacked OnUnackedTerrain; | 333 | public event TerrainUnacked OnUnackedTerrain; |
339 | 334 | ||