aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2013-08-13 22:53:47 +0100
committerMelanie2013-08-13 22:53:47 +0100
commit4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6 (patch)
tree245e7c3257c8c6c29356ba5c1eb61ae50a127226 /OpenSim/Region/OptionalModules/World
parentMerge branch 'master' into careminster (diff)
parentminor: Eliminate one of the duplicate 'have's in the HG message telling the u... (diff)
downloadopensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.zip
opensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.gz
opensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.bz2
opensim-SC_OLD-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs4
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 b0a29c0..78fe096 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -377,7 +377,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
377 m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove", 377 m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove",
378 agentID, av.Name); 378 agentID, av.Name);
379 */ 379 */
380 scene.RemoveClient(agentID, false); 380
381 scene.IncomingCloseAgent(agentID, false);
382// scene.RemoveClient(agentID, false);
381 m_avatars.Remove(agentID); 383 m_avatars.Remove(agentID);
382 384
383// m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name); 385// m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name);