aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-23 23:41:46 +0000
committerMelanie Thielker2008-12-23 23:41:46 +0000
commit318de200bd398d41b246126f541cd10ac7785b77 (patch)
tree9d41791fe7a75765b239bb1fd7f593f7fac9f4cd /OpenSim
parentAddinf InterregionData.cs IInterregionComms.cs and InterregionComms.cs (diff)
downloadopensim-SC_OLD-318de200bd398d41b246126f541cd10ac7785b77.zip
opensim-SC_OLD-318de200bd398d41b246126f541cd10ac7785b77.tar.gz
opensim-SC_OLD-318de200bd398d41b246126f541cd10ac7785b77.tar.bz2
opensim-SC_OLD-318de200bd398d41b246126f541cd10ac7785b77.tar.xz
Plumb in EventNotification* and EventGodDelete
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/IClientAPI.cs8
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs44
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs4
5 files changed, 64 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d683802..05e8f75 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -417,6 +417,10 @@ namespace OpenSim.Framework
417 public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client); 417 public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client);
418 public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client); 418 public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client);
419 419
420 public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client);
421 public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client);
422
423 public delegate void EventGodDelete(uint eventID, UUID queryID, string queryText, uint queryFlags, int queryStart, IClientAPI client);
420 424
421 #endregion 425 #endregion
422 426
@@ -733,6 +737,10 @@ namespace OpenSim.Framework
733 event ClassifiedDelete OnClassifiedDelete; 737 event ClassifiedDelete OnClassifiedDelete;
734 event ClassifiedDelete OnClassifiedGodDelete; 738 event ClassifiedDelete OnClassifiedGodDelete;
735 739
740 event EventNotificationAddRequest OnEventNotificationAddRequest;
741 event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
742 event EventGodDelete OnEventGodDelete;
743
736 // void ActivateGesture(UUID assetId, UUID gestureId); 744 // void ActivateGesture(UUID assetId, UUID gestureId);
737 745
738 /// <summary> 746 /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index aac4e32..2475b17 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -279,6 +279,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
279 private ClassifiedDelete handlerClassifiedDelete; 279 private ClassifiedDelete handlerClassifiedDelete;
280 private ClassifiedDelete handlerClassifiedGodDelete; 280 private ClassifiedDelete handlerClassifiedGodDelete;
281 281
282 private EventNotificationAddRequest handlerEventNotificationAddRequest;
283 private EventNotificationRemoveRequest handlerEventNotificationRemoveRequest;
284 private EventGodDelete handlerEventGodDelete;
285
282 private readonly IGroupsModule m_GroupsModule; 286 private readonly IGroupsModule m_GroupsModule;
283 287
284 //private TerrainUnacked handlerUnackedTerrain = null; 288 //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1042,6 +1046,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1042 public event ClassifiedDelete OnClassifiedDelete; 1046 public event ClassifiedDelete OnClassifiedDelete;
1043 public event ClassifiedDelete OnClassifiedGodDelete; 1047 public event ClassifiedDelete OnClassifiedGodDelete;
1044 1048
1049 public event EventNotificationAddRequest OnEventNotificationAddRequest;
1050 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
1051 public event EventGodDelete OnEventGodDelete;
1052
1045 public void ActivateGesture(UUID assetId, UUID gestureId) 1053 public void ActivateGesture(UUID assetId, UUID gestureId)
1046 { 1054 {
1047 } 1055 }
@@ -7280,6 +7288,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7280 this); 7288 this);
7281 break; 7289 break;
7282 7290
7291 case PacketType.EventGodDelete:
7292 EventGodDeletePacket eventGodDelete =
7293 (EventGodDeletePacket)Pack;
7294
7295 handlerEventGodDelete = OnEventGodDelete;
7296 if (handlerEventGodDelete != null)
7297 handlerEventGodDelete(
7298 eventGodDelete.EventData.EventID,
7299 eventGodDelete.QueryData.QueryID,
7300 Utils.BytesToString(
7301 eventGodDelete.QueryData.QueryText),
7302 eventGodDelete.QueryData.QueryFlags,
7303 eventGodDelete.QueryData.QueryStart,
7304 this);
7305 break;
7306
7307 case PacketType.EventNotificationAddRequest:
7308 EventNotificationAddRequestPacket eventNotificationAdd =
7309 (EventNotificationAddRequestPacket)Pack;
7310
7311 handlerEventNotificationAddRequest = OnEventNotificationAddRequest;
7312 if (handlerEventNotificationAddRequest != null)
7313 handlerEventNotificationAddRequest(
7314 eventNotificationAdd.EventData.EventID, this);
7315 break;
7316
7317 case PacketType.EventNotificationRemoveRequest:
7318 EventNotificationRemoveRequestPacket eventNotificationRemove =
7319 (EventNotificationRemoveRequestPacket)Pack;
7320
7321 handlerEventNotificationRemoveRequest = OnEventNotificationRemoveRequest;
7322 if (handlerEventNotificationRemoveRequest != null)
7323 handlerEventNotificationRemoveRequest(
7324 eventNotificationRemove.EventData.EventID, this);
7325 break;
7326
7283 default: 7327 default:
7284 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 7328 m_log.Warn("[CLIENT]: unhandled packet " + Pack);
7285 break; 7329 break;
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index a1e7ade..95744b5 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -351,6 +351,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
351 public event ClassifiedDelete OnClassifiedDelete; 351 public event ClassifiedDelete OnClassifiedDelete;
352 public event ClassifiedDelete OnClassifiedGodDelete; 352 public event ClassifiedDelete OnClassifiedGodDelete;
353 353
354 public event EventNotificationAddRequest OnEventNotificationAddRequest;
355 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
356 public event EventGodDelete OnEventGodDelete;
357
354#pragma warning restore 67 358#pragma warning restore 67
355 359
356 #endregion 360 #endregion
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index e06c4c0..fd5fa7a 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -246,6 +246,10 @@ namespace OpenSim.Region.Examples.SimpleModule
246 public event ClassifiedDelete OnClassifiedDelete; 246 public event ClassifiedDelete OnClassifiedDelete;
247 public event ClassifiedDelete OnClassifiedGodDelete; 247 public event ClassifiedDelete OnClassifiedGodDelete;
248 248
249 public event EventNotificationAddRequest OnEventNotificationAddRequest;
250 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
251 public event EventGodDelete OnEventGodDelete;
252
249#pragma warning restore 67 253#pragma warning restore 67
250 254
251 private UUID myID = UUID.Random(); 255 private UUID myID = UUID.Random();
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index e7cdee9..cb26366 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -242,6 +242,10 @@ namespace OpenSim.Tests.Common.Mock
242 public event ClassifiedDelete OnClassifiedDelete; 242 public event ClassifiedDelete OnClassifiedDelete;
243 public event ClassifiedDelete OnClassifiedGodDelete; 243 public event ClassifiedDelete OnClassifiedGodDelete;
244 244
245 public event EventNotificationAddRequest OnEventNotificationAddRequest;
246 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
247 public event EventGodDelete OnEventGodDelete;
248
245#pragma warning restore 67 249#pragma warning restore 67
246 250
247 /// <value> 251 /// <value>