aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:42:18 +0100
committerMelanie2011-10-11 22:42:18 +0100
commit652c59c0a9e7ac16127f0358e91fd216576c0ad0 (patch)
treee967460e6e83aa88bd49865af312b1b5738507fd /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
parentMerge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge (diff)
parentReinstate option to land an npc when it reaches a target. (diff)
downloadopensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.zip
opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.gz
opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.bz2
opensim-SC_OLD-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.xz
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs7
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 4f831a4..253fdee 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