diff options
author | BlueWall | 2012-04-26 16:13:47 -0400 |
---|---|---|
committer | BlueWall | 2012-04-26 16:13:47 -0400 |
commit | fba802bb03b7dee804059eae888b63c88280389c (patch) | |
tree | ca7312919830dd469dfd4e9b739d5291702007e4 /OpenSim/Region/OptionalModules/World | |
parent | Add a version of osNpcSay that takes a channel number Mantis 5747 (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-fba802bb03b7dee804059eae888b63c88280389c.zip opensim-SC-fba802bb03b7dee804059eae888b63c88280389c.tar.gz opensim-SC-fba802bb03b7dee804059eae888b63c88280389c.tar.bz2 opensim-SC-fba802bb03b7dee804059eae888b63c88280389c.tar.xz |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index adc6f9c..3ac1eb1 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
157 | 157 | ||
158 | sp.CompleteMovement(npcAvatar, false); | 158 | sp.CompleteMovement(npcAvatar, false); |
159 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | 159 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); |
160 | m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId); | 160 | m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name); |
161 | 161 | ||
162 | return npcAvatar.AgentId; | 162 | return npcAvatar.AgentId; |
163 | } | 163 | } |
@@ -340,7 +340,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
340 | scene.RemoveClient(agentID, false); | 340 | scene.RemoveClient(agentID, false); |
341 | m_avatars.Remove(agentID); | 341 | m_avatars.Remove(agentID); |
342 | 342 | ||
343 | // m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name); | 343 | m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name); |
344 | return true; | 344 | return true; |
345 | } | 345 | } |
346 | } | 346 | } |