aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-01-03 20:45:33 +0000
committerMelanie Thielker2009-01-03 20:45:33 +0000
commit7beb8a5abb801c285d16a5b1e4d8538d0381c671 (patch)
treed0a64f8e4e32a139ce3ace1d29fd5a73ae88c38c /OpenSim
parentFixed logic for sending foreign user information (HG). (diff)
downloadopensim-SC_OLD-7beb8a5abb801c285d16a5b1e4d8538d0381c671.zip
opensim-SC_OLD-7beb8a5abb801c285d16a5b1e4d8538d0381c671.tar.gz
opensim-SC_OLD-7beb8a5abb801c285d16a5b1e4d8538d0381c671.tar.bz2
opensim-SC_OLD-7beb8a5abb801c285d16a5b1e4d8538d0381c671.tar.xz
Plumb the remaining dwell packets
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/IClientAPI.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs22
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs5
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs6
5 files changed, 39 insertions, 5 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 79311d5..cb4af37 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -422,6 +422,8 @@ namespace OpenSim.Framework
422 422
423 public delegate void EventGodDelete(uint eventID, UUID queryID, string queryText, uint queryFlags, int queryStart, IClientAPI client); 423 public delegate void EventGodDelete(uint eventID, UUID queryID, string queryText, uint queryFlags, int queryStart, IClientAPI client);
424 424
425 public delegate void ParcelDwellRequest(int localID, IClientAPI client);
426
425 #endregion 427 #endregion
426 428
427 public struct DirPlacesReplyData 429 public struct DirPlacesReplyData
@@ -741,6 +743,8 @@ namespace OpenSim.Framework
741 event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 743 event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
742 event EventGodDelete OnEventGodDelete; 744 event EventGodDelete OnEventGodDelete;
743 745
746 event ParcelDwellRequest OnParcelDwellRequest;
747
744 // void ActivateGesture(UUID assetId, UUID gestureId); 748 // void ActivateGesture(UUID assetId, UUID gestureId);
745 749
746 /// <summary> 750 /// <summary>
@@ -1082,6 +1086,8 @@ namespace OpenSim.Framework
1082 void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); 1086 void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks);
1083 void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds); 1087 void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds);
1084 1088
1089 void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
1090
1085 void KillEndDone(); 1091 void KillEndDone();
1086 1092
1087 bool AddGenericPacketHandler(string MethodName, GenericMessage handler); 1093 bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 5fda592..85cc337 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -283,6 +283,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
283 private EventNotificationRemoveRequest handlerEventNotificationRemoveRequest; 283 private EventNotificationRemoveRequest handlerEventNotificationRemoveRequest;
284 private EventGodDelete handlerEventGodDelete; 284 private EventGodDelete handlerEventGodDelete;
285 285
286 private ParcelDwellRequest handlerParcelDwellRequest;
287
286 private readonly IGroupsModule m_GroupsModule; 288 private readonly IGroupsModule m_GroupsModule;
287 289
288 //private TerrainUnacked handlerUnackedTerrain = null; 290 //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1050,6 +1052,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1050 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 1052 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
1051 public event EventGodDelete OnEventGodDelete; 1053 public event EventGodDelete OnEventGodDelete;
1052 1054
1055 public event ParcelDwellRequest OnParcelDwellRequest;
1056
1053 public void ActivateGesture(UUID assetId, UUID gestureId) 1057 public void ActivateGesture(UUID assetId, UUID gestureId)
1054 { 1058 {
1055 } 1059 }
@@ -6565,6 +6569,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6565 6569
6566 } 6570 }
6567 break; 6571 break;
6572 case PacketType.ParcelDwellRequest:
6573 ParcelDwellRequestPacket dwellrq =
6574 (ParcelDwellRequestPacket)Pack;
6575
6576 handlerParcelDwellRequest = OnParcelDwellRequest;
6577 if (handlerParcelDwellRequest != null)
6578 {
6579 handlerParcelDwellRequest(dwellrq.Data.LocalID, this);
6580 }
6581 break;
6568 case PacketType.TransferAbort: 6582 case PacketType.TransferAbort:
6569 // TODO: handle this packet 6583 // TODO: handle this packet
6570 //m_log.Warn("[CLIENT]: unhandled TransferAbort packet"); 6584 //m_log.Warn("[CLIENT]: unhandled TransferAbort packet");
@@ -6573,10 +6587,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6573 // TODO: handle this packet 6587 // TODO: handle this packet
6574 //m_log.Warn("[CLIENT]: unhandled MuteListRequest packet"); 6588 //m_log.Warn("[CLIENT]: unhandled MuteListRequest packet");
6575 break; 6589 break;
6576 case PacketType.ParcelDwellRequest:
6577 // TODO: handle this packet
6578 //m_log.Warn("[CLIENT]: unhandled ParcelDwellRequest packet");
6579 break;
6580 case PacketType.UseCircuitCode: 6590 case PacketType.UseCircuitCode:
6581 // Don't display this one, we handle it at a lower level 6591 // Don't display this one, we handle it at a lower level
6582 break; 6592 break;
@@ -8283,6 +8293,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8283 OutPacket(ac, ThrottleOutPacketType.Task); 8293 OutPacket(ac, ThrottleOutPacketType.Task);
8284 } 8294 }
8285 8295
8296 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
8297 {
8298 }
8299
8286 public void KillEndDone() 8300 public void KillEndDone()
8287 { 8301 {
8288 KillPacket kp = new KillPacket(); 8302 KillPacket kp = new KillPacket();
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 61b8690..2b91391 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -355,6 +355,8 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
355 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 355 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
356 public event EventGodDelete OnEventGodDelete; 356 public event EventGodDelete OnEventGodDelete;
357 357
358 public event ParcelDwellRequest OnParcelDwellRequest;
359
358#pragma warning restore 67 360#pragma warning restore 67
359 361
360 #endregion 362 #endregion
@@ -1039,6 +1041,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
1039 { 1041 {
1040 } 1042 }
1041 1043
1044 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
1045 {
1046 }
1042 1047
1043 #endregion 1048 #endregion
1044 } 1049 }
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 79e6653..8cfaf88 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -250,6 +250,8 @@ namespace OpenSim.Region.Examples.SimpleModule
250 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 250 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
251 public event EventGodDelete OnEventGodDelete; 251 public event EventGodDelete OnEventGodDelete;
252 252
253 public event ParcelDwellRequest OnParcelDwellRequest;
254
253#pragma warning restore 67 255#pragma warning restore 67
254 256
255 private UUID myID = UUID.Random(); 257 private UUID myID = UUID.Random();
@@ -1040,6 +1042,9 @@ namespace OpenSim.Region.Examples.SimpleModule
1040 { 1042 {
1041 } 1043 }
1042 1044
1045 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
1046 {
1047 }
1043 1048
1044 #endregion 1049 #endregion
1045 } 1050 }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index fe93d6b..83bd9d9 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -246,6 +246,8 @@ namespace OpenSim.Tests.Common.Mock
246 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 246 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
247 public event EventGodDelete OnEventGodDelete; 247 public event EventGodDelete OnEventGodDelete;
248 248
249 public event ParcelDwellRequest OnParcelDwellRequest;
250
249#pragma warning restore 67 251#pragma warning restore 67
250 252
251 /// <value> 253 /// <value>
@@ -986,6 +988,8 @@ namespace OpenSim.Tests.Common.Mock
986 { 988 {
987 } 989 }
988 990
989 991 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
992 {
993 }
990 } 994 }
991} 995}