diff options
author | Melanie | 2012-04-25 01:22:09 +0100 |
---|---|---|
committer | Melanie | 2012-04-25 01:22:09 +0100 |
commit | def65cd94a18115d1a9cb89d735715c1f708a81d (patch) | |
tree | 7fd2c4c5ebb563bf7225d244b80739e9df134566 /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Comment out some debug ATTACHMENTS log messages for now. (diff) | |
download | opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.zip opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.gz opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.bz2 opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index ebf5e84..4f80dea 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -155,18 +155,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
155 | ScenePresence sp; | 155 | ScenePresence sp; |
156 | if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) | 156 | if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) |
157 | { | 157 | { |
158 | m_log.DebugFormat( | ||
159 | "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", sp.Name, sp.UUID); | ||
160 | |||
161 | sp.CompleteMovement(npcAvatar, false); | 158 | sp.CompleteMovement(npcAvatar, false); |
162 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | 159 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); |
160 | m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name); | ||
163 | } | 161 | } |
164 | else | ||
165 | { | ||
166 | m_log.WarnFormat("[NPC MODULE]: Could not find scene presence for NPC {0} {1}", sp.Name, sp.UUID); | ||
167 | npcAvatar.AgentId = UUID.Zero; | ||
168 | } | ||
169 | |||
170 | } | 162 | } |
171 | ev.Set(); | 163 | ev.Set(); |
172 | }); | 164 | }); |
@@ -308,7 +300,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
308 | scene.RemoveClient(agentID, false); | 300 | scene.RemoveClient(agentID, false); |
309 | m_avatars.Remove(agentID); | 301 | m_avatars.Remove(agentID); |
310 | 302 | ||
311 | // m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name); | 303 | m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name); |
312 | return true; | 304 | return true; |
313 | } | 305 | } |
314 | } | 306 | } |