diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 27 |
2 files changed, 22 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs index 70bda72..ba0b578 100644 --- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs | |||
@@ -30,7 +30,7 @@ using Mono.Addins; | |||
30 | // Build Number | 30 | // Build Number |
31 | // Revision | 31 | // Revision |
32 | // | 32 | // |
33 | [assembly: AssemblyVersion("0.7.6.*")] | 33 | [assembly: AssemblyVersion("0.8.0.*")] |
34 | 34 | ||
35 | 35 | ||
36 | [assembly: Addin("OpenSim.Region.OptionalModules", "0.1")] | 36 | [assembly: Addin("OpenSim.Region.OptionalModules", "0.1")] |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index f2355e2..c88ccc5 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -44,6 +44,20 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
44 | { | 44 | { |
45 | public bool SenseAsAgent { get; set; } | 45 | public bool SenseAsAgent { get; set; } |
46 | 46 | ||
47 | public delegate void ChatToNPC( | ||
48 | string message, byte type, Vector3 fromPos, string fromName, | ||
49 | UUID fromAgentID, UUID ownerID, byte source, byte audible); | ||
50 | |||
51 | /// <summary> | ||
52 | /// Fired when the NPC receives a chat message. | ||
53 | /// </summary> | ||
54 | public event ChatToNPC OnChatToNPC; | ||
55 | |||
56 | /// <summary> | ||
57 | /// Fired when the NPC receives an instant message. | ||
58 | /// </summary> | ||
59 | public event Action<GridInstantMessage> OnInstantMessageToNPC; | ||
60 | |||
47 | private readonly string m_firstname; | 61 | private readonly string m_firstname; |
48 | private readonly string m_lastname; | 62 | private readonly string m_lastname; |
49 | private readonly Vector3 m_startPos; | 63 | private readonly Vector3 m_startPos; |
@@ -624,17 +638,18 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
624 | string message, byte type, Vector3 fromPos, string fromName, | 638 | string message, byte type, Vector3 fromPos, string fromName, |
625 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | 639 | UUID fromAgentID, UUID ownerID, byte source, byte audible) |
626 | { | 640 | { |
627 | } | 641 | ChatToNPC ctn = OnChatToNPC; |
628 | 642 | ||
629 | public virtual void SendChatMessage( | 643 | if (ctn != null) |
630 | byte[] message, byte type, Vector3 fromPos, string fromName, | 644 | ctn(message, type, fromPos, fromName, fromAgentID, ownerID, source, audible); |
631 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
632 | { | ||
633 | } | 645 | } |
634 | 646 | ||
635 | public void SendInstantMessage(GridInstantMessage im) | 647 | public void SendInstantMessage(GridInstantMessage im) |
636 | { | 648 | { |
637 | 649 | Action<GridInstantMessage> oimtn = OnInstantMessageToNPC; | |
650 | |||
651 | if (oimtn != null) | ||
652 | oimtn(im); | ||
638 | } | 653 | } |
639 | 654 | ||
640 | public void SendGenericMessage(string method, UUID invoice, List<string> message) | 655 | public void SendGenericMessage(string method, UUID invoice, List<string> message) |