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

Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.

Browse Source
This commit is contained in:
Melanie
2012-01-06 22:35:06 +00:00
parent 9bab43b4d1
commit 7518b075b7
9 changed files with 94 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,9 +91,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
}
public UUID CreateNPC(
string firstname, string lastname, Vector3 position, Scene scene, AvatarAppearance appearance)
string firstname, string lastname, Vector3 position, UUID owner, Scene scene, AvatarAppearance appearance)
{
NPCAvatar npcAvatar = new NPCAvatar(firstname, lastname, position, scene);
NPCAvatar npcAvatar = new NPCAvatar(firstname, lastname, position, owner, scene);
npcAvatar.CircuitCode = (uint)Util.RandomClass.Next(0, int.MaxValue);
m_log.DebugFormat(
@@ -234,12 +234,30 @@ namespace OpenSim.Region.OptionalModules.World.NPC
return false;
}
public bool DeleteNPC(UUID agentID, Scene scene)
public UUID GetOwner(UUID agentID)
{
lock (m_avatars)
{
if (m_avatars.ContainsKey(agentID))
NPCAvatar av;
if (m_avatars.TryGetValue(agentID, out av))
{
return av.OwnerID;
}
}
return UUID.Zero;
}
public bool DeleteNPC(UUID agentID, UUID callerID, Scene scene)
{
lock (m_avatars)
{
NPCAvatar av;
if (m_avatars.TryGetValue(agentID, out av))
{
if (av.OwnerID != UUID.Zero && callerID != UUID.Zero && av.OwnerID != callerID)
return false;
scene.RemoveClient(agentID, false);
m_avatars.Remove(agentID);
@@ -268,4 +286,4 @@ namespace OpenSim.Region.OptionalModules.World.NPC
get { return true; }
}
}
}
}