3 files changed, 33 insertions, 0 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 0802952..8b20946 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -269,6 +269,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private MapItemRequest handlerMapItemRequest;
 
+        private StartLure handlerStartLure;
+        private TeleportLureRequest handlerTeleportLureRequest;
+
         private readonly IGroupsModule m_GroupsModule;
 
         //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1011,6 +1014,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event DeclineCallingCard OnDeclineCallingCard;
         public event SoundTrigger OnSoundTrigger;
 
+        public event StartLure OnStartLure;
+        public event TeleportLureRequest OnTeleportLureRequest;
 
         
         public void ActivateGesture(UUID assetId, UUID gestureId)
@@ -7168,6 +7173,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                     }
                     break;
+                case PacketType.StartLure:
+                    StartLurePacket startLureRequest = (StartLurePacket)Pack;
+                    handlerStartLure = OnStartLure;
+                    if (handlerStartLure != null)
+                        handlerStartLure(startLureRequest.Info.LureType,
+                                         Utils.BytesToString(
+                                            startLureRequest.Info.Message),
+                                         startLureRequest.TargetData[0].TargetID,
+                                         this);
+                    break;
+
+                case PacketType.TeleportLureRequest:
+                    TeleportLureRequestPacket teleportLureRequest =
+                            (TeleportLureRequestPacket)Pack;
+
+                    handlerTeleportLureRequest = OnTeleportLureRequest;
+                    if (handlerTeleportLureRequest != null)
+                        handlerTeleportLureRequest(
+                                 teleportLureRequest.Info.LureID,
+                                 teleportLureRequest.Info.TeleportFlags,
+                                 this);
+                    break;
+
                 default:
                     m_log.Warn("[CLIENT]: unhandled packet " + Pack);
                     break;
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index fb1d1ff..66662a0 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -342,6 +342,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         public event DeclineCallingCard OnDeclineCallingCard;
         public event SoundTrigger OnSoundTrigger;
 
+        public event StartLure OnStartLure;
+        public event TeleportLureRequest OnTeleportLureRequest;
+
 
 #pragma warning restore 67
 
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 5a5d0e2..35b5233 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -237,6 +237,8 @@ namespace OpenSim.Region.Examples.SimpleModule
         public event DeclineCallingCard OnDeclineCallingCard;
         public event SoundTrigger OnSoundTrigger;
 
+        public event StartLure OnStartLure;
+        public event TeleportLureRequest OnTeleportLureRequest;
 
 #pragma warning restore 67