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

Plumb the remaining dwell packets

0.6.2-post-fixes
Melanie Thielker 2009-01-03 20:45:33 +00:00
parent f1b9ff6b4b
commit 7beb8a5abb
5 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/IClientAPI.cs
View File

@ -422,6 +422,8 @@ namespace OpenSim.Framework
public delegate void EventGodDelete(uint eventID, UUID queryID, string queryText, uint queryFlags, int queryStart, IClientAPI client);
public delegate void ParcelDwellRequest(int localID, IClientAPI client);
#endregion
public struct DirPlacesReplyData
@ -741,6 +743,8 @@ namespace OpenSim.Framework
event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
event EventGodDelete OnEventGodDelete;
event ParcelDwellRequest OnParcelDwellRequest;
// void ActivateGesture(UUID assetId, UUID gestureId);
/// <summary>
@ -1082,6 +1086,8 @@ namespace OpenSim.Framework
void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks);
void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds);
void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
void KillEndDone();
bool AddGenericPacketHandler(string MethodName, GenericMessage handler);

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

@ -283,6 +283,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private EventNotificationRemoveRequest handlerEventNotificationRemoveRequest;
private EventGodDelete handlerEventGodDelete;
private ParcelDwellRequest handlerParcelDwellRequest;
private readonly IGroupsModule m_GroupsModule;
//private TerrainUnacked handlerUnackedTerrain = null;
@ -1050,6 +1052,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
public event ParcelDwellRequest OnParcelDwellRequest;
public void ActivateGesture(UUID assetId, UUID gestureId)
{
}
@ -6565,6 +6569,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
break;
case PacketType.ParcelDwellRequest:
ParcelDwellRequestPacket dwellrq =
(ParcelDwellRequestPacket)Pack;
handlerParcelDwellRequest = OnParcelDwellRequest;
if (handlerParcelDwellRequest != null)
{
handlerParcelDwellRequest(dwellrq.Data.LocalID, this);
}
break;
case PacketType.TransferAbort:
// TODO: handle this packet
//m_log.Warn("[CLIENT]: unhandled TransferAbort packet");
@ -6573,10 +6587,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// TODO: handle this packet
//m_log.Warn("[CLIENT]: unhandled MuteListRequest packet");
break;
case PacketType.ParcelDwellRequest:
// TODO: handle this packet
//m_log.Warn("[CLIENT]: unhandled ParcelDwellRequest packet");
break;
case PacketType.UseCircuitCode:
// Don't display this one, we handle it at a lower level
break;
@ -8283,6 +8293,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(ac, ThrottleOutPacketType.Task);
}
public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
{
}
public void KillEndDone()
{
KillPacket kp = new KillPacket();

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

@ -355,6 +355,8 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
public event ParcelDwellRequest OnParcelDwellRequest;
#pragma warning restore 67
#endregion
@ -1039,6 +1041,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
{
}
public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
{
}
#endregion
}

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

@ -250,6 +250,8 @@ namespace OpenSim.Region.Examples.SimpleModule
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
public event ParcelDwellRequest OnParcelDwellRequest;
#pragma warning restore 67
private UUID myID = UUID.Random();
@ -1040,6 +1042,9 @@ namespace OpenSim.Region.Examples.SimpleModule
{
}
public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
{
}
#endregion
}

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

@ -246,6 +246,8 @@ namespace OpenSim.Tests.Common.Mock
public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
public event EventGodDelete OnEventGodDelete;
public event ParcelDwellRequest OnParcelDwellRequest;
#pragma warning restore 67
/// <value>
@ -986,6 +988,8 @@ namespace OpenSim.Tests.Common.Mock
{
}
public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
{
}
}
}