OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Plumb the TP-Sending packets

0.6.1-post-fixes
Melanie Thielker 2008-12-14 05:49:07 +00:00
parent e6eb571c1d
commit 008e1fe8df
5 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/IClientAPI.cs
View File

@ -411,6 +411,9 @@ namespace OpenSim.Framework
public delegate void SoundTrigger(UUID soundId,UUID ownerid,UUID objid, UUID parentid,float Gain, Vector3 Position,UInt64 Handle); public delegate void SoundTrigger(UUID soundId,UUID ownerid,UUID objid, UUID parentid,float Gain, Vector3 Position,UInt64 Handle);
public delegate void StartLure(byte lureType, string message, UUID targetID, IClientAPI client);
public delegate void TeleportLureRequest(UUID lureID, uint teleportFlags, IClientAPI client);
#endregion #endregion
public struct DirPlacesReplyData public struct DirPlacesReplyData
@ -717,6 +720,9 @@ namespace OpenSim.Framework
event DeclineCallingCard OnDeclineCallingCard; event DeclineCallingCard OnDeclineCallingCard;
event SoundTrigger OnSoundTrigger; event SoundTrigger OnSoundTrigger;
event StartLure OnStartLure;
event TeleportLureRequest OnTeleportLureRequest;
// void ActivateGesture(UUID assetId, UUID gestureId); // void ActivateGesture(UUID assetId, UUID gestureId);
/// <summary> /// <summary>

28
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -269,6 +269,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private MapItemRequest handlerMapItemRequest; private MapItemRequest handlerMapItemRequest;
private StartLure handlerStartLure;
private TeleportLureRequest handlerTeleportLureRequest;
private readonly IGroupsModule m_GroupsModule; private readonly IGroupsModule m_GroupsModule;
//private TerrainUnacked handlerUnackedTerrain = null; //private TerrainUnacked handlerUnackedTerrain = null;
@ -1011,6 +1014,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event DeclineCallingCard OnDeclineCallingCard; public event DeclineCallingCard OnDeclineCallingCard;
public event SoundTrigger OnSoundTrigger; public event SoundTrigger OnSoundTrigger;
public event StartLure OnStartLure;
public event TeleportLureRequest OnTeleportLureRequest;
public void ActivateGesture(UUID assetId, UUID gestureId) public void ActivateGesture(UUID assetId, UUID gestureId)
@ -7168,6 +7173,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
break; 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: default:
m_log.Warn("[CLIENT]: unhandled packet " + Pack); m_log.Warn("[CLIENT]: unhandled packet " + Pack);
break; break;

3
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -342,6 +342,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
public event DeclineCallingCard OnDeclineCallingCard; public event DeclineCallingCard OnDeclineCallingCard;
public event SoundTrigger OnSoundTrigger; public event SoundTrigger OnSoundTrigger;
public event StartLure OnStartLure;
public event TeleportLureRequest OnTeleportLureRequest;
#pragma warning restore 67 #pragma warning restore 67

2
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -237,6 +237,8 @@ namespace OpenSim.Region.Examples.SimpleModule
public event DeclineCallingCard OnDeclineCallingCard; public event DeclineCallingCard OnDeclineCallingCard;
public event SoundTrigger OnSoundTrigger; public event SoundTrigger OnSoundTrigger;
public event StartLure OnStartLure;
public event TeleportLureRequest OnTeleportLureRequest;
#pragma warning restore 67 #pragma warning restore 67

3
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -233,6 +233,9 @@ namespace OpenSim.Tests.Common.Mock
public event SoundTrigger OnSoundTrigger; public event SoundTrigger OnSoundTrigger;
public event StartLure OnStartLure;
public event TeleportLureRequest OnTeleportLureRequest;
#pragma warning restore 67 #pragma warning restore 67
/// <value> /// <value>