diff options
| author | Justin Clark-Casey (justincc) | 2013-08-12 19:31:45 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-12 19:31:45 +0100 |
| commit | de6ad380f659edbc102e9bde01033acd19034c2d (patch) | |
| tree | aafdecac60f7fb3918b1c3dcb8eeabe8eefebab9 | |
| parent | Add none behaviour to pCampbot when one wants bots to just stand around (diff) | |
| download | opensim-SC-de6ad380f659edbc102e9bde01033acd19034c2d.zip opensim-SC-de6ad380f659edbc102e9bde01033acd19034c2d.tar.gz opensim-SC-de6ad380f659edbc102e9bde01033acd19034c2d.tar.bz2 opensim-SC-de6ad380f659edbc102e9bde01033acd19034c2d.tar.xz | |
Get rid of issue where removing NPCs would through an exception by routing close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather than directly to Scene.RemoveClient().
This exception was actually harmless since it occurred at the very last stage of the remove client process.
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 69189b3..c26fdfc 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -385,7 +385,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 385 | m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove", | 385 | m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove", |
| 386 | agentID, av.Name); | 386 | agentID, av.Name); |
| 387 | */ | 387 | */ |
| 388 | scene.RemoveClient(agentID, false); | 388 | |
| 389 | scene.IncomingCloseAgent(agentID, false); | ||
| 390 | // scene.RemoveClient(agentID, false); | ||
| 389 | m_avatars.Remove(agentID); | 391 | m_avatars.Remove(agentID); |
| 390 | /* | 392 | /* |
| 391 | m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", | 393 | m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", |