aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs31
1 files changed, 15 insertions, 16 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index c26fdfc..b863370 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -146,9 +146,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
146 int.MaxValue); 146 int.MaxValue);
147 147
148 m_log.DebugFormat( 148 m_log.DebugFormat(
149 "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}", 149 "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}",
150 firstname, lastname, npcAvatar.AgentId, owner, 150 firstname, lastname, npcAvatar.AgentId, owner,
151 senseAsAgent, position, scene.RegionInfo.RegionName); 151 senseAsAgent, position, scene.RegionInfo.RegionName);
152 152
153 AgentCircuitData acd = new AgentCircuitData(); 153 AgentCircuitData acd = new AgentCircuitData();
154 acd.AgentID = npcAvatar.AgentId; 154 acd.AgentID = npcAvatar.AgentId;
@@ -188,16 +188,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC
188 188
189 sp.CompleteMovement(npcAvatar, false); 189 sp.CompleteMovement(npcAvatar, false);
190 m_avatars.Add(npcAvatar.AgentId, npcAvatar); 190 m_avatars.Add(npcAvatar.AgentId, npcAvatar);
191 m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", 191 m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
192 npcAvatar.AgentId, sp.Name);
193 192
194 return npcAvatar.AgentId; 193 return npcAvatar.AgentId;
195 } 194 }
196 else 195 else
197 { 196 {
198 m_log.WarnFormat( 197 m_log.WarnFormat(
199 "[NPC MODULE]: Could not find scene presence for NPC {0} {1}", 198 "[NPC MODULE]: Could not find scene presence for NPC {0} {1}",
200 sp.Name, sp.UUID); 199 sp.Name, sp.UUID);
200
201 return UUID.Zero; 201 return UUID.Zero;
202 } 202 }
203 } 203 }
@@ -213,10 +213,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
213 ScenePresence sp; 213 ScenePresence sp;
214 if (scene.TryGetScenePresence(agentID, out sp)) 214 if (scene.TryGetScenePresence(agentID, out sp))
215 { 215 {
216 m_log.DebugFormat( 216// m_log.DebugFormat(
217 "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}", 217// "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
218 sp.Name, pos, scene.RegionInfo.RegionName, 218// sp.Name, pos, scene.RegionInfo.RegionName,
219 noFly, landAtTarget); 219// noFly, landAtTarget);
220 220
221 sp.MoveToTarget(pos, noFly, landAtTarget); 221 sp.MoveToTarget(pos, noFly, landAtTarget);
222 sp.SetAlwaysRun = running; 222 sp.SetAlwaysRun = running;
@@ -293,9 +293,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
293 ScenePresence sp; 293 ScenePresence sp;
294 if (scene.TryGetScenePresence(agentID, out sp)) 294 if (scene.TryGetScenePresence(agentID, out sp))
295 { 295 {
296 sp.HandleAgentRequestSit(m_avatars[agentID], agentID, 296 sp.HandleAgentRequestSit(m_avatars[agentID], agentID, partID, Vector3.Zero);
297 partID, Vector3.Zero);
298 //sp.HandleAgentSit(m_avatars[agentID], agentID);
299 297
300 return true; 298 return true;
301 } 299 }
@@ -387,8 +385,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
387 */ 385 */
388 386
389 scene.IncomingCloseAgent(agentID, false); 387 scene.IncomingCloseAgent(agentID, false);
390// scene.RemoveClient(agentID, false); 388
391 m_avatars.Remove(agentID); 389 m_avatars.Remove(agentID);
390
392 /* 391 /*
393 m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", 392 m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}",
394 agentID, av.Name); 393 agentID, av.Name);
@@ -427,4 +426,4 @@ namespace OpenSim.Region.OptionalModules.World.NPC
427 av.OwnerID == callerID; 426 av.OwnerID == callerID;
428 } 427 }
429 } 428 }
430} 429} \ No newline at end of file