diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 3a03101..6c8e2fc 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
148 | OnInstantMessage(this, new GridInstantMessage(m_scene, | 148 | OnInstantMessage(this, new GridInstantMessage(m_scene, |
149 | m_uuid, m_firstname + " " + m_lastname, | 149 | m_uuid, m_firstname + " " + m_lastname, |
150 | target, 0, false, message, | 150 | target, 0, false, message, |
151 | UUID.Zero, false, Position, new byte[0], true)); | 151 | UUID.Zero, false, Position, new byte[0])); |
152 | } | 152 | } |
153 | 153 | ||
154 | public void SendAgentOffline(UUID[] agentIDs) | 154 | public void SendAgentOffline(UUID[] agentIDs) |
@@ -607,15 +607,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
607 | { | 607 | { |
608 | } | 608 | } |
609 | 609 | ||
610 | public virtual void SendChatMessage( | 610 | public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, |
611 | string message, byte type, Vector3 fromPos, string fromName, | 611 | UUID fromAgentID, byte source, byte audible) |
612 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
613 | { | 612 | { |
614 | } | 613 | } |
615 | 614 | ||
616 | public virtual void SendChatMessage( | 615 | public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, |
617 | byte[] message, byte type, Vector3 fromPos, string fromName, | 616 | UUID fromAgentID, byte source, byte audible) |
618 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
619 | { | 617 | { |
620 | } | 618 | } |
621 | 619 | ||
@@ -911,13 +909,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
911 | 909 | ||
912 | public void Close() | 910 | public void Close() |
913 | { | 911 | { |
914 | Close(true, false); | 912 | Close(true); |
915 | } | 913 | } |
916 | 914 | ||
917 | public void Close(bool sendStop, bool force) | 915 | public void Close(bool sendStop) |
918 | { | 916 | { |
919 | // Remove ourselves from the scene | ||
920 | m_scene.RemoveClient(AgentId, false); | ||
921 | } | 917 | } |
922 | 918 | ||
923 | public void Start() | 919 | public void Start() |