diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index a0ae55a..6803644 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -155,20 +155,21 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
155 | "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", sp.Name, sp.UUID); | 155 | "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", sp.Name, sp.UUID); |
156 | 156 | ||
157 | sp.CompleteMovement(npcAvatar, false); | 157 | sp.CompleteMovement(npcAvatar, false); |
158 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | ||
158 | } | 159 | } |
159 | else | 160 | else |
160 | { | 161 | { |
161 | m_log.WarnFormat("[NPC MODULE]: Could not find scene presence for NPC {0} {1}", sp.Name, sp.UUID); | 162 | m_log.WarnFormat("[NPC MODULE]: Could not find scene presence for NPC {0} {1}", sp.Name, sp.UUID); |
163 | npcAvatar.AgentId = UUID.Zero; | ||
162 | } | 164 | } |
163 | 165 | ||
164 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | ||
165 | } | 166 | } |
166 | ev.Set(); | 167 | ev.Set(); |
167 | }); | 168 | }); |
168 | 169 | ||
169 | ev.WaitOne(); | 170 | ev.WaitOne(); |
170 | 171 | ||
171 | m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId); | 172 | // m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId); |
172 | 173 | ||
173 | return npcAvatar.AgentId; | 174 | return npcAvatar.AgentId; |
174 | } | 175 | } |