aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces
diff options
context:
space:
mode:
authorMelanie2012-05-07 12:07:47 +0100
committerMelanie2012-05-07 12:07:47 +0100
commitdf7abbb367ecac2fb09e1af10d3ec2a792ea2ed2 (patch)
tree3e36b8757455c88c3c1f20c14b635e662350aab9 /OpenSim/Region/Framework/Interfaces
parentMerge branch 'avination' into careminster (diff)
parentadd a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O... (diff)
downloadopensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.zip
opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.gz
opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.bz2
opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r--OpenSim/Region/Framework/Interfaces/INPCModule.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index b4dc3c3..860483d 100644
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -113,9 +113,11 @@ namespace OpenSim.Region.Framework.Interfaces
113 /// </param> 113 /// </param>
114 /// <param name="landAtTarget"> 114 /// <param name="landAtTarget">
115 /// If true and the avatar is flying when it reaches the target, land. 115 /// If true and the avatar is flying when it reaches the target, land.
116 /// </param> 116 /// </param> name="running">
117 /// If true, NPC moves with running speed.
117 /// <returns>True if the operation succeeded, false if there was no such agent or the agent was not an NPC</returns> 118 /// <returns>True if the operation succeeded, false if there was no such agent or the agent was not an NPC</returns>
118 bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget); 119 ///
120 bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget, bool running);
119 121
120 /// <summary> 122 /// <summary>
121 /// Stop the NPC's current movement. 123 /// Stop the NPC's current movement.