aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-04-17 22:54:23 +0100
committerMelanie2011-04-17 22:54:23 +0100
commitdbf52b8cd1690e9df3501295c8c99d35988781d3 (patch)
treed96a94ebf7edd430e7ad45bea55bedecfa6f96ad
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-dbf52b8cd1690e9df3501295c8c99d35988781d3.zip
opensim-SC_OLD-dbf52b8cd1690e9df3501295c8c99d35988781d3.tar.gz
opensim-SC_OLD-dbf52b8cd1690e9df3501295c8c99d35988781d3.tar.bz2
opensim-SC_OLD-dbf52b8cd1690e9df3501295c8c99d35988781d3.tar.xz
Correct the delegate for classified deletes
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs3
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 6ec69d3..2f35a6c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -441,6 +441,7 @@ namespace OpenSim.Framework
441 public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client); 441 public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client);
442 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); 442 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);
443 public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client); 443 public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client);
444 public delegate void ClassifiedGodDelete(UUID classifiedID, UUID queryID, IClientAPI client);
444 445
445 public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client); 446 public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client);
446 public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client); 447 public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client);
@@ -914,7 +915,7 @@ namespace OpenSim.Framework
914 event ClassifiedInfoRequest OnClassifiedInfoRequest; 915 event ClassifiedInfoRequest OnClassifiedInfoRequest;
915 event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 916 event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
916 event ClassifiedDelete OnClassifiedDelete; 917 event ClassifiedDelete OnClassifiedDelete;
917 event ClassifiedDelete OnClassifiedGodDelete; 918 event ClassifiedGodDelete OnClassifiedGodDelete;
918 919
919 event EventNotificationAddRequest OnEventNotificationAddRequest; 920 event EventNotificationAddRequest OnEventNotificationAddRequest;
920 event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 921 event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e72159c..e7afbb3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -255,7 +255,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
255 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 255 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
256 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 256 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
257 public event ClassifiedDelete OnClassifiedDelete; 257 public event ClassifiedDelete OnClassifiedDelete;
258 public event ClassifiedDelete OnClassifiedGodDelete; 258 public event ClassifiedGodDelete OnClassifiedGodDelete;
259 public event EventNotificationAddRequest OnEventNotificationAddRequest; 259 public event EventNotificationAddRequest OnEventNotificationAddRequest;
260 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 260 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
261 public event EventGodDelete OnEventGodDelete; 261 public event EventGodDelete OnEventGodDelete;
@@ -10812,6 +10812,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10812 if (handlerClassifiedGodDelete != null) 10812 if (handlerClassifiedGodDelete != null)
10813 handlerClassifiedGodDelete( 10813 handlerClassifiedGodDelete(
10814 classifiedGodDelete.Data.ClassifiedID, 10814 classifiedGodDelete.Data.ClassifiedID,
10815 classifiedGodDelete.Data.QueryID,
10815 this); 10816 this);
10816 return true; 10817 return true;
10817 } 10818 }