ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
This commit is contained in:
Melanie
2012-02-09 00:19:37 +00:00
parent 9c6ba8d18f dbe32a1f6d
commit 7c888f6af1
8 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
View File

@@ -299,13 +299,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC
NPCAvatar av;
if (m_avatars.TryGetValue(agentID, out av))
{
// m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove", agentID, av.Name);
scene.RemoveClient(agentID, false);
m_avatars.Remove(agentID);
// m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name);
return true;
}
}
// m_log.DebugFormat("[NPC MODULE]: Could not find {0} to remove", agentID);
return false;
}