aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/IClientAPI.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs28
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs3
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs3
5 files changed, 42 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 8a3c4b6..751a2a5 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -411,6 +411,9 @@ namespace OpenSim.Framework
411 411
412 public delegate void SoundTrigger(UUID soundId,UUID ownerid,UUID objid, UUID parentid,float Gain, Vector3 Position,UInt64 Handle); 412 public delegate void SoundTrigger(UUID soundId,UUID ownerid,UUID objid, UUID parentid,float Gain, Vector3 Position,UInt64 Handle);
413 413
414 public delegate void StartLure(byte lureType, string message, UUID targetID, IClientAPI client);
415 public delegate void TeleportLureRequest(UUID lureID, uint teleportFlags, IClientAPI client);
416
414 #endregion 417 #endregion
415 418
416 public struct DirPlacesReplyData 419 public struct DirPlacesReplyData
@@ -717,6 +720,9 @@ namespace OpenSim.Framework
717 event DeclineCallingCard OnDeclineCallingCard; 720 event DeclineCallingCard OnDeclineCallingCard;
718 event SoundTrigger OnSoundTrigger; 721 event SoundTrigger OnSoundTrigger;
719 722
723 event StartLure OnStartLure;
724 event TeleportLureRequest OnTeleportLureRequest;
725
720 // void ActivateGesture(UUID assetId, UUID gestureId); 726 // void ActivateGesture(UUID assetId, UUID gestureId);
721 727
722 /// <summary> 728 /// <summary>
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
269 269
270 private MapItemRequest handlerMapItemRequest; 270 private MapItemRequest handlerMapItemRequest;
271 271
272 private StartLure handlerStartLure;
273 private TeleportLureRequest handlerTeleportLureRequest;
274
272 private readonly IGroupsModule m_GroupsModule; 275 private readonly IGroupsModule m_GroupsModule;
273 276
274 //private TerrainUnacked handlerUnackedTerrain = null; 277 //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1011,6 +1014,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1011 public event DeclineCallingCard OnDeclineCallingCard; 1014 public event DeclineCallingCard OnDeclineCallingCard;
1012 public event SoundTrigger OnSoundTrigger; 1015 public event SoundTrigger OnSoundTrigger;
1013 1016
1017 public event StartLure OnStartLure;
1018 public event TeleportLureRequest OnTeleportLureRequest;
1014 1019
1015 1020
1016 public void ActivateGesture(UUID assetId, UUID gestureId) 1021 public void ActivateGesture(UUID assetId, UUID gestureId)
@@ -7168,6 +7173,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7168 } 7173 }
7169 } 7174 }
7170 break; 7175 break;
7176 case PacketType.StartLure:
7177 StartLurePacket startLureRequest = (StartLurePacket)Pack;
7178 handlerStartLure = OnStartLure;
7179 if (handlerStartLure != null)
7180 handlerStartLure(startLureRequest.Info.LureType,
7181 Utils.BytesToString(
7182 startLureRequest.Info.Message),
7183 startLureRequest.TargetData[0].TargetID,
7184 this);
7185 break;
7186
7187 case PacketType.TeleportLureRequest:
7188 TeleportLureRequestPacket teleportLureRequest =
7189 (TeleportLureRequestPacket)Pack;
7190
7191 handlerTeleportLureRequest = OnTeleportLureRequest;
7192 if (handlerTeleportLureRequest != null)
7193 handlerTeleportLureRequest(
7194 teleportLureRequest.Info.LureID,
7195 teleportLureRequest.Info.TeleportFlags,
7196 this);
7197 break;
7198
7171 default: 7199 default:
7172 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 7200 m_log.Warn("[CLIENT]: unhandled packet " + Pack);
7173 break; 7201 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
342 public event DeclineCallingCard OnDeclineCallingCard; 342 public event DeclineCallingCard OnDeclineCallingCard;
343 public event SoundTrigger OnSoundTrigger; 343 public event SoundTrigger OnSoundTrigger;
344 344
345 public event StartLure OnStartLure;
346 public event TeleportLureRequest OnTeleportLureRequest;
347
345 348
346#pragma warning restore 67 349#pragma warning restore 67
347 350
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
237 public event DeclineCallingCard OnDeclineCallingCard; 237 public event DeclineCallingCard OnDeclineCallingCard;
238 public event SoundTrigger OnSoundTrigger; 238 public event SoundTrigger OnSoundTrigger;
239 239
240 public event StartLure OnStartLure;
241 public event TeleportLureRequest OnTeleportLureRequest;
240 242
241#pragma warning restore 67 243#pragma warning restore 67
242 244
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 9b44ac4..1bcf829 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -233,6 +233,9 @@ namespace OpenSim.Tests.Common.Mock
233 233
234 public event SoundTrigger OnSoundTrigger; 234 public event SoundTrigger OnSoundTrigger;
235 235
236 public event StartLure OnStartLure;
237 public event TeleportLureRequest OnTeleportLureRequest;
238
236#pragma warning restore 67 239#pragma warning restore 67
237 240
238 /// <value> 241 /// <value>