aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:26:56 +0100
committerMelanie2011-10-25 02:26:56 +0100
commite2de57ca29116fd1dae77065104d7f431da711fc (patch)
treead5ed1720690812044cbfc7fb6072283b4e144c7 /OpenSim/Region/Framework/Interfaces
parentMerge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge (diff)
parentImplement osNpcSit(). This is still in development so don't trust it (diff)
downloadopensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.zip
opensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.tar.gz
opensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.tar.bz2
opensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.tar.xz
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r--OpenSim/Region/Framework/Interfaces/INPCModule.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index 5e5c4a1..9dd8c79 100644
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -95,6 +95,15 @@ namespace OpenSim.Region.Framework.Interfaces
95 bool Say(UUID agentID, Scene scene, string text); 95 bool Say(UUID agentID, Scene scene, string text);
96 96
97 /// <summary> 97 /// <summary>
98 /// Sit the NPC.
99 /// </summary>
100 /// <param name="agentID"></param>
101 /// <param name="partID"></param>
102 /// <param name="scene"></param>
103 /// <returns>true if the sit succeeded, false if not</returns>
104 bool Sit(UUID agentID, UUID partID, Scene scene);
105
106 /// <summary>
98 /// Delete an NPC. 107 /// Delete an NPC.
99 /// </summary> 108 /// </summary>
100 /// <param name="agentID">The UUID of the NPC</param> 109 /// <param name="agentID">The UUID of the NPC</param>