From dbf52b8cd1690e9df3501295c8c99d35988781d3 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 17 Apr 2011 22:54:23 +0100 Subject: [PATCH] Correct the delegate for classified deletes --- OpenSim/Framework/IClientAPI.cs | 3 ++- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 6ec69d313c..2f35a6ccab 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -441,6 +441,7 @@ namespace OpenSim.Framework public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client); 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); public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client); + public delegate void ClassifiedGodDelete(UUID classifiedID, UUID queryID, IClientAPI client); public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client); public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client); @@ -914,7 +915,7 @@ namespace OpenSim.Framework event ClassifiedInfoRequest OnClassifiedInfoRequest; event ClassifiedInfoUpdate OnClassifiedInfoUpdate; event ClassifiedDelete OnClassifiedDelete; - event ClassifiedDelete OnClassifiedGodDelete; + event ClassifiedGodDelete OnClassifiedGodDelete; event EventNotificationAddRequest OnEventNotificationAddRequest; event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e72159cbe0..e7afbb34b2 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -255,7 +255,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event ClassifiedInfoRequest OnClassifiedInfoRequest; public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; public event ClassifiedDelete OnClassifiedDelete; - public event ClassifiedDelete OnClassifiedGodDelete; + public event ClassifiedGodDelete OnClassifiedGodDelete; public event EventNotificationAddRequest OnEventNotificationAddRequest; public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; public event EventGodDelete OnEventGodDelete; @@ -10812,6 +10812,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (handlerClassifiedGodDelete != null) handlerClassifiedGodDelete( classifiedGodDelete.Data.ClassifiedID, + classifiedGodDelete.Data.QueryID, this); return true; }