diff options
author | Melanie | 2012-02-08 13:04:23 +0100 |
---|---|---|
committer | Melanie | 2012-02-08 13:04:23 +0100 |
commit | 9c6ba8d18f4b3c4b457240f251612691cb271d90 (patch) | |
tree | 4dce5e2aec6db01eaa6932732f94f78552f09f86 /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-9c6ba8d18f4b3c4b457240f251612691cb271d90.zip opensim-SC_OLD-9c6ba8d18f4b3c4b457240f251612691cb271d90.tar.gz opensim-SC_OLD-9c6ba8d18f4b3c4b457240f251612691cb271d90.tar.bz2 opensim-SC_OLD-9c6ba8d18f4b3c4b457240f251612691cb271d90.tar.xz |
Push more NPC stuff into threads
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 6a48b89..3ea7352 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -140,26 +140,33 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
140 | // acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]); | 140 | // acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]); |
141 | // } | 141 | // } |
142 | 142 | ||
143 | lock (m_avatars) | 143 | ManualResetEvent ev = new ManualResetEvent(false); |
144 | { | ||
145 | scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, acd); | ||
146 | scene.AddNewClient(npcAvatar, PresenceType.Npc); | ||
147 | 144 | ||
148 | ScenePresence sp; | 145 | Util.FireAndForget(delegate(object x) { |
149 | if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) | 146 | lock (m_avatars) |
150 | { | 147 | { |
151 | m_log.DebugFormat( | 148 | scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, acd); |
152 | "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", sp.Name, sp.UUID); | 149 | scene.AddNewClient(npcAvatar, PresenceType.Npc); |
153 | 150 | ||
154 | sp.CompleteMovement(npcAvatar, false); | 151 | ScenePresence sp; |
155 | } | 152 | if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) |
156 | else | 153 | { |
157 | { | 154 | m_log.DebugFormat( |
158 | m_log.WarnFormat("[NPC MODULE]: Could not find 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 | |||
157 | sp.CompleteMovement(npcAvatar, false); | ||
158 | } | ||
159 | else | ||
160 | { | ||
161 | m_log.WarnFormat("[NPC MODULE]: Could not find scene presence for NPC {0} {1}", sp.Name, sp.UUID); | ||
162 | } | ||
163 | |||
164 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | ||
159 | } | 165 | } |
166 | ev.Set(); | ||
167 | }); | ||
160 | 168 | ||
161 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | 169 | ev.WaitOne(); |
162 | } | ||
163 | 170 | ||
164 | m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId); | 171 | m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId); |
165 | 172 | ||