ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add copyright header. Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2009-08-21 15:42:36 +09:00
parent 31e7e1b5f9
commit 158ad39df0
4 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
p_returnUuid = UUID.Zero;
}
while(p_returnUuid == UUID.Zero)
while (p_returnUuid == UUID.Zero)
{
Thread.Sleep(250);
}
@@ -102,31 +102,37 @@ namespace OpenSim.Region.OptionalModules.World.NPC
public void Autopilot(UUID agentID, Scene scene, Vector3 pos)
{
lock (m_avatars)
{
if (m_avatars.ContainsKey(agentID))
{
ScenePresence sp;
scene.TryGetAvatar(agentID, out sp);
sp.DoAutoPilot(0, pos, m_avatars[agentID]);
}
}
}
public void Say(UUID agentID, Scene scene, string text)
{
lock (m_avatars)
{
if (m_avatars.ContainsKey(agentID))
{
m_avatars[agentID].Say(text);
}
}
}
public void DeleteNPC(UUID agentID, Scene scene)
{
lock(m_avatars)
lock (m_avatars)
{
if (m_avatars.ContainsKey(agentID))
{
scene.RemoveClient(agentID);
m_avatars.Remove(agentID);
}
}
}
@@ -146,7 +152,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{
p_inUse = false;
NPCAvatar npcAvatar = new NPCAvatar(p_firstname, p_lastname, p_position, p_scene);
npcAvatar.CircuitCode = (uint) Util.RandomClass.Next(0, int.MaxValue);